Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37
am: bf11142c36

* commit 'bf11142c36121e948f9476bc21ae817532a2e74a':
  Fixed a crash with notification groups

Change-Id: I520415e49cccc48c5d26b460aa85ec804e6d9a50