Merge "Accessibility shortcut secondary action - handle all preferred shortcut type key"