Merge "Addjust text colors" into tm-qpr-dev