Fix unwanted reconnect after disconnect
Update sample app