Merge "Add physical port to display viewport"