Merge change 23751 into eclair

* changes:
  Fix deadlock in wallpaper.