Merge "Only send brightnessChangeEvent if display is on" into udc-dev