Merge "Fix NPE in allowOverlappingTransitions" into main