Merge "Support per-port display configs in VTS" into main