Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." into nyc-mr1-dev