Merge "Added scrim visibility check." into main