Merge "Suppress flyout during mode switching" into main