Merge "Keyboard shortcuts: A11Y fixes cherry pick" into nyc-mr1-dev