am adb2b655: am d9001a7d: Merge "NPE in WallpaperHandler"

* commit 'adb2b6554ff7670390a0acd5507dffe430a4cd0d':
  NPE in WallpaperHandler