am ae779592: am 4e67a2a4: Merge change I22807d19 into eclair-mr2

Merge commit 'ae77959253d69643ba0fc71647630cee880f3519'

* commit 'ae77959253d69643ba0fc71647630cee880f3519':
  Do not use the Cursor if it is closed.