Merge "Update to use SurfaceConfig."