Merge "Differentiate seamless rotations in shell transitions" into sc-v2-dev