Merge "Treat groups of conversations as a conversation" into rvc-dev