Merge "Reduce ActiveTransition to its token for callbacks" into main