Merge "Don't backup/restore screen brightness" into pi-dev