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