Merge "Refactoring updateAccessibilityShortcutTargets" into main