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