Merge "Fix scrims not fading in" into tm-dev