Merge "Fix channel connected signal emission." into ics-mr1