Merge "Handle errors gracefully in WallpaperCropActivity." into ub-launcher3-burnaby-polish