Merge "Improve platform TransitionSet behavior"