Merge "collect more stats about the notification API" into mnc-dev