Integrating latest from github/staging

Integrating up through commit 5e1bdae

Code/LauncherUnified/Platform/Windows/Launcher_Traits_Windows.h

@@ -12,7 +12,5 @@
 #pragma once
 
 #define AZ_TRAIT_LAUNCHER_LOWER_CASE_PATHS 0
-#define AZ_TRAIT_LAUNCHER_SET_APPROOT_OVERRIDE 0
-#define AZ_TRAIT_LAUNCHER_ALLOW_CMDLINE_APPROOT_OVERRIDE 1
 #define AZ_TRAIT_LAUNCHER_USE_CRY_DYNAMIC_MODULE_HANDLE 0
 #define AZ_TRAIT_SHARED_LIBRARY_FILENAME_FORMAT R"(%s\%s.dll)"

Code/LauncherUnified/Platform/Windows/launcher_project_windows.cmake

@@ -21,17 +21,14 @@ else()
     )
 endif()
 
-# Find the resource from the game gem
-get_target_property(${project}_SOURCE_DIR ${project} SOURCE_DIR) # Point to where the code is
-get_filename_component(${project}_SOURCE_PARENT_DIR ${${project}_SOURCE_DIR} DIRECTORY) # Parent directory
-
-set(ICON_FILE ${${project}_SOURCE_PARENT_DIR}/Resources/GameSDK.ico)
+set(ICON_FILE ${project_real_path}/Gem/Resources/GameSDK.ico)
 if(NOT EXISTS ${ICON_FILE})
     # Try the common LauncherUnified icon instead
     set(ICON_FILE Resources/GameSDK.ico)
 endif()
+
 if(EXISTS ${ICON_FILE})
-    set(target_file ${CMAKE_CURRENT_BINARY_DIR}/${project}.GameLauncher.rc)
+    set(target_file ${CMAKE_CURRENT_BINARY_DIR}/${project_name}.GameLauncher.rc)
     configure_file(Platform/Windows/Launcher.rc.in
         ${target_file}
         @ONLY