Merge "b/5039455 Makes cal color adjust everywhere we display cal colors"