Merge "JpegR refactor: rename recoverymap to jpegr"