Merge "Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347fd am: b2988f3e4f" into rvc-d1-dev-plus-aosp am: 2c08ec90d1 am: 5e5bd0ab0e
Change-Id: I8109539d6d9d0e10ef512df45e3dae308d19ab88
This commit is contained in: