Merge "Reflect QS shortcut changes in a11y pages." into main