Merge "CursorWindow_test: fix leaks"