Merge "[9/n] TransitionStateHolder implementation" into main