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

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