Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1