Merge "Make wallpaper cropper more robust " into klp-dev