Merge "Cleanup flag "clear_default_from_a11y_shortcut..."" into main