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

Change-Id: I1102ed0d33c2497b069e2285f097f6bfbe8b5685