Merge "Fix FileSystemProvider open for external USB files" into sc-dev