Merge "Add a BindEventManager to fix ConversationNotifications.kt"