Merge "Move Viewport types to DisplayViewport"