Merge "Revert^2 "PiP: support direct entering split from PiP."" into sc-v2-dev