Merge "Remove unused a11y_qs_shortcut flag" into main