Fix Cursor Leak (Again)

When cursor is done, the cursor must be closed to avoid cursor leak.

Change-Id: I5f750a6bb499f86d4c76da40d171e9edfe6981d2