Merge "Accessibility shortcut secondary action - improve shortcutPreference"