Merge "Throw clear error if a row doesn't fit into CursorWindow"