Merge "Fix NPE in WallpaperDrawable" into nyc-dev