fix(api): Fix liquid getting homed into pipette after certain protoco…

…ls end (#17285)

Closes RESC-345.

api/src/opentrons/protocol_engine/execution/hardware_stopper.py

@@ -65,7 +65,7 @@ async def _home_everything_except_plungers(self) -> None:
             axes=[MotorAxis.X, MotorAxis.Y, MotorAxis.LEFT_Z, MotorAxis.RIGHT_Z]
         )
 
-    async def _drop_tip(self) -> None:
+    async def _try_to_drop_tips(self) -> None:
         """Drop currently attached tip, if any, into trash after a run cancel."""
         attached_tips = self._state_store.pipettes.get_all_attached_tips()
 
@@ -134,9 +134,9 @@ async def do_stop_and_recover(
             PostRunHardwareState.HOME_THEN_DISENGAGE,
         )
         if drop_tips_after_run:
-            await self._drop_tip()
-            await self._hardware_api.stop(home_after=home_after_stop)
-        else:
-            await self._hardware_api.stop(home_after=False)
-            if home_after_stop:
-                await self._home_everything_except_plungers()
+            await self._try_to_drop_tips()
+
+        await self._hardware_api.stop(home_after=False)
+
+        if home_after_stop:
+            await self._home_everything_except_plungers()