Merge "Named brightness mappings" into main