Merge "Revert "Accessibility shortcut improvement (1/n)""