Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev