Merge "Making the setSurface non-static"