Merge branch 'fixes/branches-view-remove-serialized-texture2d' into fixes/branches-view-globe-icon

# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

@@ -483,34 +483,14 @@ protected override Texture2D GetNodeIcon(TreeNode node)
 
         public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Texture2D folderIcon, Texture2D rootFolderIcon)
         {
-            var localsLoaded = false;
-
-            if (ActiveNodeIcon == null)
+            var needsLoad = ActiveNodeIcon == null || BranchIcon == null || FolderIcon == null || RemoteIcon == null;
+            if (needsLoad)
             {
-                localsLoaded = true;
                 ActiveNodeIcon = activeBranchIcon;
-            }
-
-            if (BranchIcon == null)
-            {
-                localsLoaded = true;
                 BranchIcon = branchIcon;
-            }
-
-            if (FolderIcon == null)
-            {
-                localsLoaded = true;
                 FolderIcon = folderIcon;
-            }
-
-            if (RemoteIcon == null)
-            {
-                localsLoaded = true;
                 RemoteIcon = rootFolderIcon;
-            }
 
-            if (localsLoaded)
-            {
                 LoadNodeIcons();
             }
         }