Merge change 25192 into eclair

* changes:
  Some improvements for wallpaper configuration.