Merge "Change BrightnessMappingStrategy to use DDC values" into sc-dev