am b9f960e0: Merge "Fixed cancel() not working correctly"

* commit 'b9f960e094d53440be5c7e8759a74dbb0ab57317':
  Fixed cancel() not working correctly