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

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

Change-Id: I6f36c1dae68de0e4741ee74910696869c21b86ec