Merge "Better guarantee a11y service initial state" into oc-mr1-dev