Merge "Revert "Make the brightness int scale match the slider"" into main