This time for sure: make wallpapers work

Fix http://b/issue?id=2262556. Make restoring
work as well as switching between live and 
non-live wallpapers. Also support live wallpaper
as default.