Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev

core/java/android/view/inputmethod/InputMethodManager.java

@@ -645,6 +645,11 @@ public final class InputMethodManager {
         @Override
         public void setCurrentRootView(ViewRootImpl rootView) {
             synchronized (mH) {
+                if (mCurRootView != null) {
+                    // Reset the last served view and restart window focus state of the root view.
+                    mCurRootView.getImeFocusController().setServedView(null);
+                    mRestartOnNextWindowFocus = true;
+                }
                 mCurRootView = rootView;
             }
         }