Merge "Fixed an accessibility issue with the pin view" into oc-dev