Merge "Add NamedListenerSet that can be used to improve Trace performance by caching listener names" into udc-qpr-dev