Merge "Merge "Revert "Keeps the served view of the window when focus to the...
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 am: 2c08ec90
Change-Id: I6899825ab7132657711b46b997c0df0ac235b056