Merge "Respect user's choice on a11y shortcut dialog" into oc-dev