Merge "filebackend: Make resyncFiles() easier to use"