Merge change I1864d098 into eclair

* changes:
  Improve wallpaper offset handling.