Merge "make the notification enqueue rate threshold a setting" into nyc-dev