Merge "BUG-1120: fold GenerationalListenerMap back"