Merge "Settings should store unthrottled brightness" into main