Merge "add metrics for notification and group expansion" into nyc-dev