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

Change-Id: If6d3b1cad8b7ba37dd9a12d57566dcd4393648ac