Merge "Fix a11y shortcut"