Merge "Make TransitionController's helper handle start and queue" into udc-dev