Merge "Use MatrixCursor instead of ArrayListCursor."