Merge "SurfaceControl: Close CloseGuard when destroying surface in transaction." into pi-dev