Merge "Fix crash while connecting channel."