Merge branch 'main' into Atom/santorac/CavityMaps-ATOM-14040

Note there were significant conflicts in LightingModel.azsli and StandardPBR_ForwardPass.azsl. I only did basic resolves of these conflicts, mostly preserving the changes from main and distarding the changes in the local branch. The shaders are not compiling at this point, and of course the tests are not passing. I will fix up the code to make corrections in a separate commit, to make it easier to review those changes separate from this merge.

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/create_maya_files.py

@@ -363,4 +363,3 @@ base_directory = sys.argv[-3]
 destination_directory = sys.argv[-2]
 modify_naming = sys.argv[-1]
 CreateMayaFiles(file_list, base_directory, destination_directory, modify_naming)
-

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/legacy_asset_converter/main.py

@@ -103,6 +103,7 @@ _LOGGER.debug('Initializing: {0}.'.format({module_name}))
 
 
 class LegacyFilesConverter(QtWidgets.QDialog):
+
     def __init__(self, parent=None):
         super(LegacyFilesConverter, self).__init__(parent)