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

Change-Id: I9afa6eee62b0077c19da554ee1d04cb622c4bb20