Merge "PiP: Don't start with marking pinch-resize gesture ongoing." into sc-dev