am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev

* commit '2af5010a6793d27eda86432f1ec3ebbe92e1d99e':
  Fixed a crash in the notification group manager