Merge "Fixing quickswitch window not properly aligned in split-screen" into sc-dev