Merge "Fixed a crash in the notification group manager" into mnc-dev