Merge "Fix PiP Shell Transitions" into sc-v2-dev