Revise `logout_and_terminate` logic

[davidsteiner]

Decide if we should always set the state to Disconnected immediately or wait for disconnect to happen. Should we introduce a new PendingDisconnect state?