Merge remote-tracking branch 'origin/cds-405' into cds-405
# Conflicts: # packages/stream_chat_flutter/lib/src/channel_avatar.dart # packages/stream_chat_flutter/lib/src/channel_name.dart
This commit is contained in:
# Conflicts: # packages/stream_chat_flutter/lib/src/channel_avatar.dart # packages/stream_chat_flutter/lib/src/channel_name.dart