am f8e5c37b: am 135e5899: save/restore viewport properly when taking screenshot

* commit 'f8e5c37bc59c70b0a0388f8a690d0d4bead9cc6f':
  save/restore viewport properly when taking screenshot