Merge branch 'fixes/menu-header-disappears' into enhancements/branches-view-rollup

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

Author: StanleyGoldman

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

@@ -40,8 +40,6 @@ class Window : BaseWindow
         [SerializeField] private CacheUpdateEvent lastCurrentBranchAndRemoteChangedEvent;
         [NonSerialized] private bool currentBranchAndRemoteHasUpdate;
 
-        [NonSerialized] private Texture2D smallLogo;
-
         [MenuItem(LaunchMenu)]
         public static void Window_GitHub()
         {
@@ -94,6 +92,8 @@ public override void Initialize(IApplicationManager applicationManager)
             BranchesView.InitializeView(this);
             SettingsView.InitializeView(this);
             InitProjectView.InitializeView(this);
+
+            titleContent = new GUIContent(Title, Styles.SmallLogo);
         }
 
         public override void OnEnable()
@@ -103,13 +103,6 @@ public override void OnEnable()
 #if DEVELOPER_BUILD
             Selection.activeObject = this;
 #endif
-            // Set window title
-            if (smallLogo == null)
-            {
-                smallLogo = Styles.SmallLogo;
-                titleContent = new GUIContent(Title, smallLogo);
-            }
-
             if (Repository != null)
                 Repository.CheckCurrentBranchAndRemoteChangedEvent(lastCurrentBranchAndRemoteChangedEvent);
 
@@ -127,8 +120,6 @@ public override void OnDisable()
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();
-            if (titleContent.image == null)
-                titleContent = new GUIContent(Title, Styles.SmallLogo);
             MaybeUpdateData();
 
             if (ActiveView != null)
@@ -204,7 +195,7 @@ private void MaybeUpdateData()
 
             if (Repository != null)
             {
-                if (currentBranchAndRemoteHasUpdate)
+                if (repoBranch == null || repoRemote == null || currentBranchAndRemoteHasUpdate)
                 {
                     var repositoryCurrentBranch = Repository.CurrentBranch;
                     var updatedRepoBranch = repositoryCurrentBranch.HasValue ? repositoryCurrentBranch.Value.Name : null;
@@ -259,13 +250,13 @@ private void MaybeUpdateData()
                 }
             }
 
-            if (shouldUpdateContentFields)
+            if (shouldUpdateContentFields || repoBranchContent == null || repoUrlContent == null)
             {
                 repoBranchContent = new GUIContent(repoBranch, Window_RepoBranchTooltip);
 
-                if (updatedRepoRemote != null)
+                if (repoRemote != null)
                 {
-                    repoUrlContent = new GUIContent(repoUrl, string.Format(Window_RepoUrlTooltip, updatedRepoRemote));
+                    repoUrlContent = new GUIContent(repoUrl, string.Format(Window_RepoUrlTooltip, repoRemote));
                 }
                 else
                 {