Merge "jpegrecoverymap: Fix XMP metadata test"