Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev