Merge "Hook-up nextTransitionForward to shell transitions" into sc-v2-dev