Merge "Reduce flickers of Injection" into tm-dev