Merge "Backport TransitionSet enhancements in L"