am db904b47: Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1

* commit 'db904b4782a4dfc9d81d5d0616dea3656893b539':
  Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data