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

Change-Id: I42729d1a98ec4272671fa8ae8da7ccb6798a82fa