Merge "Depedencency cleanups to SwiftFileBackend"