Merge change 21811 into eclair

* changes:
  More wallpaper fixes: scroll position, visibility, leaking.