Merge "Fix crash in built-in wallpaper cropper" into klp-dev