Merge "Separate color into app color and dot color" into tm-dev