Merge "Add tests for two accessibility state listeners" into oc-dev