Merge "Revert "Keeps the served view of the window when focus to the ne...""...
Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347 am: 57305841 am: 1e9ccb8a am: deb5c075
Change-Id: I684742c848ba4fbd44763f86e0076a92f1fe265f