[Port] [6000.3] [ShaderGraph] Fix swizzle mask regression plus some other minor issues

Author: svc-reach-platform-support

Packages/com.unity.shadergraph/Editor/Data/Nodes/Channel/SwizzleNode.cs

@@ -102,7 +102,7 @@ public sealed override void UpdateNodeAfterDeserialization()
 
             int outputLength = _maskInput.Length;
             int inputLength = 1;
-            foreach(var c in _maskInput)
+            foreach(var c in _maskInput.ToLowerInvariant())
             {
                 switch (c)
                 {

Packages/com.unity.shadergraph/Editor/Drawing/Inspector/PropertyDrawers/ShaderInputPropertyDrawer.cs

@@ -1957,7 +1957,7 @@ void KeywordAddCallbacks()
                     else if (int.TryParse(displayName, out int intVal) || float.TryParse(displayName, out float floatVal))
                         Debug.LogWarning("Invalid display name. Display names cannot be valid integer or floating point numbers.");
                     else
-                        keyword.entries[index] = new KeywordEntry(GetFirstUnusedKeywordID(), displayName, referenceName);
+                        keyword.entries[index] = new KeywordEntry(entry.id, displayName, referenceName);
 
                     this._postChangeValueCallback(true);
                 }

Packages/com.unity.shadergraph/Editor/Resources/Styles/Controls/ChannelEnumControlView.uss

@@ -14,7 +14,7 @@ ChannelEnumControlView > Label {
     max-width: 100px;
     width: 50px;
     margin-left: 8px;
-    margin-right: 8px;
+    margin-right: 12px;
     -unity-text-align : middle-left;
     flex-grow: 1;
 }