Merge "Fix a bug where listen callbacks would not be called"