Merge "Accessibility shortcut improvement (7/n)"