Merge "Handle RTSP make port error case"