Merge "Add ability to show/hide accessibility_shortcut_preference."