Merge change 21207 into eclair

* changes:
  Always have a wallpaper service running.