Merge "Don't iterate channel list in bgthread"