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

Change-Id: Ia7b2b47db9368348d5a7319f67944fb421cc00d5