Merge "Add dynamic color support" into tm-dev