Merge "Fix NPE from startNewTransition" into tm-qpr-dev