Merge "Change secondary_text_color to match spec" into pi-car-dev