Merge "Fix issue where scrim would be transparent" into sc-qpr1-dev