Merge "Fix bug where scrim would be transparent"