am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak"

* commit '64ed6b2cfa6a4bb58f3f8a9b59d840cdce049c80':
  Fix cursor memory leak