am ed17165a: am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"

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