Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev