am d9001a7d: Merge "NPE in WallpaperHandler"

* commit 'd9001a7dc5854d5dfc24a5ead19ad8c05acf171e':
  NPE in WallpaperHandler