Merge branch 'ww1dev/hdrp17/svn' into ww1dev/hdrp17/staging

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/RenderPass/Upscalers/PSSRUpscalerPlugin.cs

@@ -159,7 +159,7 @@ namespace UnityEngine.Rendering.HighDefinition.AMD.PSSR
 
         public override void Execute(CommandBuffer cmd, in FSR2CommandExecutionData executeData, in FSR2TextureTable textures)
         {
-            if (!_initialized)
+            if (!_initialized || executeData.renderSizeWidth < _initData.displaySizeWidth / 3 || executeData.renderSizeHeight < _initData.displaySizeHeight / 3)
             {
                 cmd.Blit(textures.colorInput, textures.colorOutput);
                 return;

Packages/com.unity.ugui/Runtime/TMP/TMP_SubMeshUI.cs

@@ -216,7 +216,14 @@ namespace TMPro
             go.hideFlags = TMP_Settings.hideSubTextObjects ? HideFlags.HideAndDontSave : HideFlags.DontSave;
 
             go.transform.SetParent(textComponent.transform, false);
+            
+            // -- WW1MOD --
+            // This SpriteAsset check determines if this SubText is a sprite
+            // If it is, we move it to the top of the Child Order so it renders first (behind the keybind label)
+            if(materialReference.spriteAsset != null)
 	            go.transform.SetAsFirstSibling();
+            // -- END WW1MOD --
+            
             go.layer = textComponent.gameObject.layer;
 
             #if UNITY_EDITOR