Merge "Tidy Up BrightnessEvent" into main