Merge "Scrim opacity" into oc-dr1-dev
am: ce2ebd1285

Change-Id: Idf63df1a75f5db96d2129cac17c0189edeff46a7