Merge commit '6e478d7afb33eff4efe704a16b1a05435b431062' into eclair-plus-aosp * commit '6e478d7afb33eff4efe704a16b1a05435b431062': Fix deadlock in wallpaper.