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