Merge "Notification summary updates." into nyc-dev