Merge change 25734 into eclair

* changes:
  Show the live wallpaper on the lock screen.