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