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: 57305841 am: dcc70158" into rvc-qpr-dev-plus-aosp am: 0dd114b2
Change-Id: Icc6867e1b62fe790d403a8555d54ef67061ccfad