Fixes an issue with the tour guide not initializing some values in time.

WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m

@@ -99,6 +99,12 @@ - (void)refreshIconImage
         self.blavatarImageView.image = [UIImage siteIconPlaceholder];
     }
 
+    [self refreshSpotlight];
+}
+
+- (void)refreshSpotlight {
+    [self removeQuickStartSpotlight];
+
     if ([[QuickStartTourGuide find] isCurrentElement:QuickStartTourElementSiteIcon]) {
         [self addQuickStartSpotlight];
     }

WordPress/Classes/ViewRelated/Blog/QuickStartChecklistViewController.swift

@@ -92,13 +92,18 @@ class QuickStartChecklistViewController: UITableViewController {
         dataManager = QuickStartChecklistManager(blog: blog,
                                                  tours: configuration.tours,
                                                  didSelectTour: { [weak self] tour in
-            DispatchQueue.main.async {
+            DispatchQueue.main.async { [weak self] in
                 WPAnalytics.track(.quickStartChecklistItemTapped, withProperties: ["task_name": tour.analyticsKey])
-                self?.dismiss(animated: true) {
-                    if let blog = self?.blog,
-                        let tourGuide = QuickStartTourGuide.find() {
-                        tourGuide.start(tour: tour, for: blog)
-                    }
+
+                guard let self = self else {
+                    return
+                }
+
+                let tourGuide = QuickStartTourGuide.find()
+                tourGuide?.prepare(tour: tour, for: self.blog)
+
+                self.dismiss(animated: true) {
+                    tourGuide?.begin()
                 }
             }
         }, didTapHeader: { [unowned self] expand in

WordPress/Classes/ViewRelated/Blog/QuickStartTourGuide.swift

@@ -101,7 +101,8 @@ open class QuickStartTourGuide: NSObject {
                                 self?.currentSuggestion = nil
 
                                 if accepted {
-                                    self?.start(tour: tour, for: blog)
+                                    self?.prepare(tour: tour, for: blog)
+                                    self?.begin()
                                     cancelTimer(false)
                                     WPAnalytics.track(.quickStartSuggestionButtonTapped, withProperties: ["type": "positive"])
                                 } else {
@@ -116,7 +117,13 @@ open class QuickStartTourGuide: NSObject {
         WPAnalytics.track(.quickStartSuggestionViewed)
     }
 
-    func start(tour: QuickStartTour, for blog: Blog) {
+    /// Prepares to begin the specified tour.
+    ///
+    /// - Parameters:
+    ///     - tour: the tour to prepare for running.
+    ///     - blog: the blog in which the tour will take place.
+    ///
+    func prepare(tour: QuickStartTour, for blog: Blog) {
         endCurrentTour()
         dismissSuggestion()
 
@@ -126,10 +133,21 @@ open class QuickStartTourGuide: NSObject {
             fallthrough
         default:
             currentTourState = TourState(tour: tour, blog: blog, step: 0)
-            showCurrentStep()
         }
     }
 
+    /// Begins the prepared tour.  Should only be called after `prepare(tour:for:)`.
+    ///
+    func begin() {
+        guard let state = currentTourState,
+            state.step == 0 else {
+
+            return
+        }
+
+        showCurrentStep()
+    }
+
     func complete(tour: QuickStartTour, for blog: Blog, postNotification: Bool = true) {
         completed(tour: tour, for: blog, postNotification: postNotification)
     }