Merge "Make auto-brightness modes generic" into main