Merge "Fix BrightnessTracker's handling of color temperature"