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

* commit '0315a2c5640dc91cd1689db9dff997e43e4effca':
  Tweak setViewport stuff for fwd-compat