Merge "Clean-up brightness configuration."