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

Change-Id: I706b407462dda80ef939cc3dd962a580cc50d35e