Merge "Scrim opacity" into oc-dr1-dev