Merge "Hide API to listen to a11y service state" into oc-dev