Merge "Accessibility shortcut improvement (6/n)"