Merge change 21471 into eclair

* changes:
  Add Galaxy wallpaper