Merge "Add Settings Provider data stores" into main