Revert "Revert "Settings: use DefaultContainerService for all file operations""

This reverts commit 9410ba073b4ff26382e5b637e28ff3d8ce98fc78.
Update API