Merge "Fix a bug where the legacy extra info is reset on connect."