Merge "Add support for Group Conversations for NotificationMsg + small fixes"