Merge "NPE in WallpaperHandler"