Merge "Consolidate screen brightness constraints"