Merge "Ensure the switch to DesktopMode before launching PiP" into main