Merge "jpegrecoverymap: XMP fixes." into udc-dev