Merge "PiP: Pinch-resize auto to max size if it's pretty close to it." into sc-dev