Merge "Clean up CursorWindow code. Bug: 5332296"