Merge "Migrating BrightnessThermalClamper to BrightnessStateModifier interface" into main