Merge "Fix the transition from Split to PiP" into sc-v2-dev