Merge "Release SurfaceControl native resource when test finishes"