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

* commit '9e30e20233136d499447622213e0f383e695dd04':
  Fixed a crash in the notification group manager