Merge "Get rid of the "pid" parameter from createSurface"