Merge "Try to load colors more frequently" into tm-dev