Merge "Fix brightness slider margin issues" into main