Merge "Fixed Brightness dialog UI dimensions" into main