am 41c07671: Merge "Clear mCurSender when mCurChannel is modified." into jb-mr2-dev

* commit '41c076715da58990dc9b0be749bba28fc75d3b78':
  Clear mCurSender when mCurChannel is modified.