Merge "Fix PiP rotation when Shell Transition is on." into sc-v2-dev