Merge change 21380 into eclair

* changes:
  More work on wallpapers.