Merge "Add physical port to DisplayViewport"