Merge "Let the client compute the surface size on its own"