Merge "Allow more concurrent notifications" into rvc-qpr-dev