Merge "Introduce xmls for primary/secondary text colors"