Merge "Allow extending the SurfacePackage lifetime" into sc-dev