Merge "Revert "Move brightnessMaxReason to DisplayBrightnessState"" into main