Merge "Move wallpaper crop logic in a new class WallpaperCropper"