am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"

* commit 'f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
  Tweak setViewport stuff for fwd-compat