Merge "Fix cursor window leak when query execution fails."