Merge "Move the indexing back into DatabaseIndexingManager"