Merge "Move ContentState.Transition back into TransitionState.Transition (1/2)" into main