Merge "Fix warning when force-disconnect but there is no connected API" into nyc-dev