Merge "Fix issue where scrims would not go away"