Merge "Revert "Keeps the served view of the window when focus to the ne...""...

        @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;

            }

        }