Merge "Make sure cancel is called on tear down." into lmp-dev