Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev

Author: Amith Yamasani

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

@@ -214,9 +214,9 @@ public void setNeedsInput(boolean needsInput) {
      */
     public synchronized void reset() {
         if (DEBUG) Log.d(TAG, "reset()");
-        if (mKeyguardView != null) {
-            mKeyguardView.reset();
-        }
+        // User might have switched, check if we need to go back to keyguard
+        // TODO: It's preferable to stay and show the correct lockscreen or unlock if none
+        maybeCreateKeyguardLocked(shouldEnableScreenRotation());
     }
 
     public synchronized void onScreenTurnedOff() {