Merge "Prevent PiP and Bubble from overlapping." into main