Merge "Make patchoat match offset when given a patched image"