Merge "Tweak setViewport stuff for fwd-compat"