Merge "Don't save default doze brightness" into main