Merge "Refactor accessibility button support detection" into oc-dev