Merge "Merge getDisplayViewport into DisplayInfo"