Merge "Consolidate two different onTransitionCancelled implementations" into sc-dev