Merge "Don't use private attribute for color" into tm-qpr-dev