Merge "Don't store doze manual brightness in setting" into main