Merge "Guard against the NPE in getTransitionType()" into tm-dev