Merge "Cap scale when swiping to PiP" into main