Merge "add conversation flags to channel atom" into rvc-dev