Merge "Add logging for color variants" into tm-dev