Merge "Fix color lint" into tm-dev