Merge "Move Index provider conversion into Settings provider"