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