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

Change-Id: Ibb7783661bdb4e37d6542071c158e7a486493b95