Merge "Use thread-safe collection for storing listeners" into main