Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"