Merge "Handle nil variant in applyTransitions" into main