Merge "Accessibility shortcut improvement (3/n)"