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