Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots."