Merge change Id6c0b844 into eclair

* changes:
  Unbreak setting photos as wallpaper