Merge "Fix visual issues with splitscreen to desktop transition." into main