Merge commit '149c0543a3d5f450686b7c3d142ac5f8fcf61ed4' * commit '149c0543a3d5f450686b7c3d142ac5f8fcf61ed4': Partial fix for 2069703: Fix race condition in KeyguardViewManager.hide() that could result in a blank screen.