Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev am: 17bc1fd0 am: a24c9698
am: 1d25f5f2
* commit '1d25f5f2':
Fixed a bug where the pin wasn't scaled correctly
Fixed a bug where the scrim was transparent
Change-Id: I31b8f46ff2223019757cc5f761b60c83817b6ea1