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

Change-Id: I5d0903587fd707870f71ce24e04291aaf9dc7dac