Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 am: 5432938bf6
am: f96c5fd462

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

Change-Id: If68dd896bbc9ae65941782589391d53f3063ea3d