Merge "Move most DefaultMixedHandler logic to MixedTransition." into main