Merge "Accessibility shortcut secondary action - auto hide divider in shortcutPreference"