Merge "Snap to the edge when expanding the PiP window" into rvc-dev