Merge "Include disabled state color to preference text colors" into pi-car-dev