Merge "Fix WallpaperCropper key error." into main