Merge "SF: Populate DisplayConnectionType in DisplayInfo"