Merge "Do not allow exit PiP during swipe up" into main