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: dcc70158
Change-Id: I207eb0c84035f5bb9d484a88952342a829158483