Merge "Cleanup flag "restore_a11y_shortcut_target_..."" into main