Merge "Revert "Fix the logics in ImeFocusController#onPostWindowFocus"" into rvc-dev