Merge "Simplify initialization of transition controller"