Merge "Fix brightness per user" into main