Merge "Add haptic feedback for a11y shortcut"