Merge "Save the user preferred shortcut on Edit A11yShortcut screen" into main