Merge "Confirm a11y shortcut service for correct user" into oc-dev