Merge change 24929 into eclair

* changes:
  Port wallpaper chooser change from Launcher to Launcher2.