Merge "Correct screenshot bounds calculation." into nyc-dev