Merge "Do not dismiss split while exit PiP to full-screen" into main