Merge "Add type to DisplayViewport"