am 401ab105: am 6e478d7a: Merge change 23751 into eclair

Merge commit '401ab1058ab11da429616cd7f3ec951f8bf4db30'

* commit '401ab1058ab11da429616cd7f3ec951f8bf4db30':
  Fix deadlock in wallpaper.