Merge "Better handling of rtsp connection and disconnection." into gingerbread