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