Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"