Merge "Correct screenshot bounds calculation." into nyc-dev
am: df9b907

* commit 'df9b907814a924f18c4ab5b13438bd4e093e6cc8':
  Correct screenshot bounds calculation.

Change-Id: Idad0f055cc7fffb90203a6ed09fbcf6dcdbdc3d1