Merge "Reparent SurfacePackage to null when releasing it" into sc-dev