Merge "Add default WallpaperCropper to the build" into klp-dev