Merge "[PiP2] Prevent double enter PiP" into main