Merge "Add handling of NativeRescueParty resets to RescueParty."