Merge "Merge "Fixed an issue where the scrim could be lost" into nyc-dev am:...
Merge "Merge "Fixed an issue where the scrim could be lost" into nyc-dev am: 05d61ede am: bcfd427b" into nyc-mr1-dev-plus-aosp
am: beef6de1
* commit 'beef6de1':
Change-Id: I5f5188192ee68c35b229c650c01e21a91bec2b6e