Merge "Fix PiP rotation when Shell Transition is on."