Merge "Send RTSP control connection keep-alive requests" into ics-mr1