Merge "Remove deprecated concepts.util.ListenerRegistry"