Merge "NPE guard in setupViewport"