Merge "Add the disabled color file" into tm-dev