Merge "Resize PiP proportionally upon fold/unfold" into main