Merge "Fix night mode for config-based color upconversions" into nyc-mr1-dev