Merge "Refactoring Accessibility settings to use ShortcutConstants.UserShortcutType" into main