Merge "Cosmetic changes in messaging/_notifications"