cleanly separate whether (un)docking is completed or in progress