Merge "Don't backup/restore screen brightness" into pi-dev
am: 3a7e021169

Change-Id: Id27f2a0631fde41e2b247ec3eb48419bb48bc84d