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