Merge "Dump type from DisplayInfo" into main