Merge "Remove SurfaceFreezer leash when unfreeze" into sc-v2-dev