Merge "Fix NPE when checking pending transition type" into main