Merge "Merge "Fixed an accessibility issue with the pin view" into oc-dev am: 06fdcf8a40 am: 656c1105f6" into oc-dr1-dev-plus-aosp