Merge "Revert "Keeps the served view of the window when focus to the ne..."" into rvc-dev am: e974c347fd

Change-Id: I82c5d52bd8d07fd9c6aefbc123b5f05f4b61426f