Merge "Fix mobile signal colors to match wifi et al" into oc-dr1-dev