Merge "Fix AccessibilityManager returning duplicate services" into oc-dev