Merge "Fix overlay is expanded in split-screen" into main