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