Merge "Make ListenerMultiplexer more flexible"