Merge "don't call setSize() when creating SurfaceControl"