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

Change-Id: Iffb78dd8a44993c06a64ae17e32055fd310589e6