Merge change 27351 into eclair

* changes:
  Allow wallpaper picker to work.