Merge "Test conversation notification deletion"