Merge "Fix wrong brightnessOverriddenByWindow state in BrightnessSlider" into main