Merge "Restructure a11y shortcut settings"