Merge "Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347 am: b2988f3e" into rvc-d1-dev-plus-aosp