Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev am: 53ddffdf3a am: 573e6ec9a3
am: 738925cee8

Change-Id: Icbd35a5722cf3d501b3c802f2860a398e5ee9d8e