Merge "Add mechanism to update the CloseGuard callsite of a SurfaceControl"