Merge "Move all transition queueing into transitioncontroller" into udc-dev