Merge "Fix channel conditional in cancelAll."