Fix crash when setting wallpaper

Also clean up some unused code

Change-Id: Ibef8d3d594cc859a993640fd6ee578e9eeb633d1
10 files changed