Merge "Propagate error codes from createSurface" into pi-dev