Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev