Merge "Reflect BrightnessThrottler effects in Settings, UI and ABC"