Merge remote-tracking branch 'origin/master' into 1.13

# Conflicts:
#	Content/Shaders/DepthOfField.flax
#	Source/Engine/Content/Asset.cpp

Source/Editor/Modules/ContentImportingModule.cs

@@ -252,6 +252,8 @@ namespace FlaxEditor.Modules
         /// <param name="settings">Import settings to override. Use null to skip this value.</param>
         private void Import(string inputPath, string outputPath, bool isInBuilt, bool skipSettingsDialog = false, object settings = null)
         {
+            inputPath = StringUtils.NormalizePath(inputPath);
+            outputPath = StringUtils.NormalizePath(outputPath);
             lock (_requests)
             {
                 _requests.Add(new Request
@@ -311,7 +313,9 @@ namespace FlaxEditor.Modules
                         }
 
                         _importBatchDone++;
+                        Profiler.BeginEvent("ImportFileEnd");
                         ImportFileEnd?.Invoke(entry, failed);
+                        Profiler.EndEvent();
                     }
                 }
                 else