Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev