Merge "patchoat: DisableAutoClose when patching in place"