Merge change 21307 into eclair

* changes:
  Turn off static live wallpaper for now.