am 410676bb: Merge change 21307 into eclair

Merge commit '410676bbac107726499589b665ef61e3d47355ab'

* commit '410676bbac107726499589b665ef61e3d47355ab':
  Turn off static live wallpaper for now.