Merge "Accessibility shortcut improvement (2/n)"