am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"

* commit '5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
  Cursor leakage due to cancellation signal