Merge "Adjust a11y shortcut settings based on UX input"