Merge "Optimize FileSystemProvider.includeFile" into qt-dev