Merge "Change Display White Balance to track the Planckian locus"