Merge "Add config flag to disable Pinch resize PiP" into main