Fix integration issues after rebase.

Author: avi-c

Sources/MapboxNavigation/NavigationMapView.swift

@@ -218,9 +218,6 @@ open class NavigationMapView: UIView {
 
     deinit {
         annotationCache = nil
-    }
-    
-    deinit {
         unsubscribeFromNotifications()
     }
 
@@ -1094,7 +1091,7 @@ open class NavigationMapView: UIView {
         }
 
         // sort the edges by distance from the user
-        if let userCoordinate = userLocationForCourseTracking?.coordinate {
+        if let userCoordinate = mostRecentUserCourseViewLocation?.coordinate {
             intersections.sort { (intersection1, intersection2) -> Bool in
                 if let edge1Start = intersection1.coordinate, let edge2Start = intersection2.coordinate {
                     return userCoordinate.distance(to: edge1Start) < userCoordinate.distance(to: edge2Start)