Merge "RTSP: add timeout scheme to handle error cases." into nyc-dev