Merge "Keep the adjusted and unadjusted spline in BrightnessMappingStrategy" into udc-dev