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

Change-Id: I408238eff55b469ff0407c72c504e4e1adcc9b8b