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

Change-Id: Ie5ca3300ff77bb925c62bba109eda8d839398c22