Merge "Don't enable a11y service if scary dialog obscured" into oc-dev