Merge "Do not update state of Disconnected Connection" into nyc-dev