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

* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
  Disconnect on socket error on the RTSP control connection.