Merge "Fixing typo in the A11y Shortcut edit page" into main