Merge "PIN/PUK Views not showing after boot" into sc-dev am: a701830c12

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13815463

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b9a8df4a327fd0d49d22b2536cb6a6399469a6b

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

@@ -739,8 +739,13 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
     }
 
     public void onThemeChanged() {
+        boolean wasShowing = mBouncer.isShowing();
+        boolean wasScrimmed = mBouncer.isScrimmed();
+
         hideBouncer(true /* destroyView */);
         mBouncer.prepare();
+
+        if (wasShowing) showBouncer(wasScrimmed);
     }
 
     public void onKeyguardFadedAway() {