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