Merge "Don't backup/restore screen brightness"