Merge "Accessibility shortcut improvement (1/n)"