Merge "DisplayViewport should only have actual viewports (1/2)"