Merge branch 'release-agua' into masterupstream/fabian-merge-release-agua

# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp

10 files changed, 205 insertions, 108 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
index 9f256c341b..64b33ad598 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
@@ -302,12 +302,14 @@ class AnnotationManager {
     }
 
     for (Marker marker : selectedMarkers) {
-      if (marker.isInfoWindowShown()) {
-        marker.hideInfoWindow();
-      }
+      if (marker != null) {
+        if (marker.isInfoWindowShown()) {
+          marker.hideInfoWindow();
+        }
 
-      if (marker instanceof MarkerView) {
-        markerViewManager.deselect((MarkerView) marker, false);
+        if (marker instanceof MarkerView) {
+          markerViewManager.deselect((MarkerView) marker, false);
+        }
       }
     }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
index 9ccff387f5..2956d864e6 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
@@ -7,22 +7,20 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.NonNull;
-import android.text.Html;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
-
 import com.mapbox.mapboxsdk.R;
+import com.mapbox.mapboxsdk.attribution.Attribution;
+import com.mapbox.mapboxsdk.attribution.AttributionParser;
 import com.mapbox.mapboxsdk.camera.CameraPosition;
 import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.services.android.telemetry.MapboxTelemetry;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 /**
  * Responsible for managing attribution interactions on the map.
@@ -39,8 +37,8 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
 
   private final Context context;
   private final MapboxMap mapboxMap;
-  private String[] attributionKeys;
-  private HashMap<String, String> attributionMap;
+  private String[] attributionTitles;
+  private Set<Attribution> attributionSet;
 
   AttributionDialogManager(@NonNull Context context, @NonNull MapboxMap mapboxMap) {
     this.context = context;
@@ -50,18 +48,26 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
   // Called when someone presses the attribution icon on the map
   @Override
   public void onClick(View view) {
-    attributionMap = new AttributionBuilder(context, mapboxMap).build();
+    attributionSet = new AttributionBuilder(mapboxMap).build();
     showAttributionDialog();
   }
 
   private void showAttributionDialog() {
-    attributionKeys = attributionMap.keySet().toArray(new String[attributionMap.size()]);
+    attributionTitles = getAttributionTitles();
     AlertDialog.Builder builder = new AlertDialog.Builder(context);
     builder.setTitle(R.string.mapbox_attributionsDialogTitle);
-    builder.setAdapter(new ArrayAdapter<>(context, R.layout.mapbox_attribution_list_item, attributionKeys), this);
+    builder.setAdapter(new ArrayAdapter<>(context, R.layout.mapbox_attribution_list_item, attributionTitles), this);
     builder.show();
   }
 
+  private String[] getAttributionTitles() {
+    List<String> titles = new ArrayList<>();
+    for (Attribution attribution : attributionSet) {
+      titles.add(attribution.getTitle());
+    }
+    return titles.toArray(new String[titles.size()]);
+  }
+
   // Called when someone selects an attribution or telemetry settings from the dialog
   @Override
   public void onClick(DialogInterface dialog, int which) {
@@ -73,7 +79,7 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
   }
 
   private boolean isLatestEntry(int attributionKeyIndex) {
-    return attributionKeyIndex == attributionKeys.length - 1;
+    return attributionKeyIndex == attributionTitles.length - 1;
   }
 
   private void showTelemetryDialog() {
@@ -105,7 +111,8 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
   }
 
   private void showMapFeedbackWebPage(int which) {
-    String url = attributionMap.get(attributionKeys[which]);
+    Attribution[] attributions = attributionSet.toArray(new Attribution[attributionSet.size()]);
+    String url = attributions[which].getUrl();
     if (url.contains(MAP_FEEDBACK_URL)) {
       url = buildMapFeedbackMapUrl(mapboxMap.getCameraPosition());
     }
@@ -132,46 +139,24 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
 
   private static class AttributionBuilder {
 
-    private final HashMap<String, String> map = new LinkedHashMap<>();
-    private final Context context;
     private final MapboxMap mapboxMap;
 
-    AttributionBuilder(Context context, MapboxMap mapboxMap) {
-      this.context = context.getApplicationContext();
+    AttributionBuilder(MapboxMap mapboxMap) {
       this.mapboxMap = mapboxMap;
     }
 
-    private HashMap<String, String> build() {
+    private Set<Attribution> build() {
+      List<String> attributions = new ArrayList<>();
       for (Source source : mapboxMap.getSources()) {
-        parseAttribution(source.getAttribution());
-      }
-      addTelemetryEntryToAttributionMap();
-      return map;
-    }
-
-    private void parseAttribution(String attributionSource) {
-      if (!TextUtils.isEmpty(attributionSource)) {
-        SpannableStringBuilder htmlBuilder = (SpannableStringBuilder) Html.fromHtml(attributionSource);
-        URLSpan[] urlSpans = htmlBuilder.getSpans(0, htmlBuilder.length(), URLSpan.class);
-        for (URLSpan urlSpan : urlSpans) {
-          map.put(resolveAnchorValue(htmlBuilder, urlSpan), urlSpan.getURL());
-        }
+        attributions.add(source.getAttribution());
       }
-    }
-
-    private String resolveAnchorValue(SpannableStringBuilder htmlBuilder, URLSpan urlSpan) {
-      int start = htmlBuilder.getSpanStart(urlSpan);
-      int end = htmlBuilder.getSpanEnd(urlSpan);
-      int length = end - start;
-      char[] charKey = new char[length];
-      htmlBuilder.getChars(start, end, charKey, 0);
-      return String.valueOf(charKey);
-    }
 
-    private void addTelemetryEntryToAttributionMap() {
-      String telemetryKey = context.getString(R.string.mapbox_telemetrySettings);
-      String telemetryLink = context.getString(R.string.mapbox_telemetryLink);
-      map.put(telemetryKey, telemetryLink);
+      return new AttributionParser.Options()
+        .withCopyrightSign(true)
+        .withImproveMap(true)
+        .withTelemetryAttribution(true)
+        .withAttributionData(attributions.toArray(new String[attributions.size()]))
+        .build().getAttributions();
     }
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
index f046744c31..69a43d4d3e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
@@ -1,5 +1,6 @@
 package com.mapbox.mapboxsdk.maps;
 
+import android.os.Handler;
 import android.support.annotation.NonNull;
 
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -9,10 +10,16 @@ import static com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraMoveCanceledListener;
 import static com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraMoveListener;
 import static com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraMoveStartedListener;
 
+/**
+ * Class responsible for dispatching camera change events to registered listeners.
+ */
 class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, MapboxMap.OnCameraMoveListener,
   MapboxMap.OnCameraMoveCanceledListener, OnCameraIdleListener {
 
+  private final Handler handler = new Handler();
+
   private boolean idle = true;
+  private int moveStartedReason;
 
   private final CopyOnWriteArrayList<OnCameraMoveStartedListener> onCameraMoveStarted = new CopyOnWriteArrayList<>();
   private final CopyOnWriteArrayList<OnCameraMoveCanceledListener> onCameraMoveCanceled = new CopyOnWriteArrayList<>();
@@ -24,6 +31,74 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
   private OnCameraMoveListener onCameraMoveListener;
   private OnCameraIdleListener onCameraIdleListener;
 
+  private final Runnable onCameraMoveStartedRunnable = new Runnable() {
+    @Override
+    public void run() {
+      // deprecated API
+      if (onCameraMoveStartedListener != null) {
+        onCameraMoveStartedListener.onCameraMoveStarted(moveStartedReason);
+      }
+
+      // new API
+      if (!onCameraMoveStarted.isEmpty()) {
+        for (OnCameraMoveStartedListener cameraMoveStartedListener : onCameraMoveStarted) {
+          cameraMoveStartedListener.onCameraMoveStarted(moveStartedReason);
+        }
+      }
+    }
+  };
+
+  private final Runnable onCameraMoveRunnable = new Runnable() {
+    @Override
+    public void run() {
+      // deprecated API
+      if (onCameraMoveListener != null && !idle) {
+        onCameraMoveListener.onCameraMove();
+      }
+
+      // new API
+      if (!onCameraMove.isEmpty() && !idle) {
+        for (OnCameraMoveListener cameraMoveListener : onCameraMove) {
+          cameraMoveListener.onCameraMove();
+        }
+      }
+    }
+  };
+
+  private final Runnable onCameraMoveCancelRunnable = new Runnable() {
+    @Override
+    public void run() {
+      // deprecated API
+      if (onCameraMoveCanceledListener != null && !idle) {
+        onCameraMoveCanceledListener.onCameraMoveCanceled();
+      }
+
+      // new API
+      if (!onCameraMoveCanceled.isEmpty() && !idle) {
+        for (OnCameraMoveCanceledListener cameraMoveCanceledListener : onCameraMoveCanceled) {
+          cameraMoveCanceledListener.onCameraMoveCanceled();
+        }
+      }
+    }
+  };
+
+  private final Runnable onCameraIdleRunnable = new Runnable() {
+    @Override
+    public void run() {
+      // deprecated API
+      if (onCameraIdleListener != null) {
+        onCameraIdleListener.onCameraIdle();
+      }
+
+      // new API
+      if (!onCameraIdle.isEmpty()) {
+        for (OnCameraIdleListener cameraIdleListener : onCameraIdle) {
+          cameraIdleListener.onCameraIdle();
+        }
+      }
+    }
+  };
+
   @Deprecated
   void setOnCameraMoveStartedListener(OnCameraMoveStartedListener onCameraMoveStartedListener) {
     this.onCameraMoveStartedListener = onCameraMoveStartedListener;
@@ -45,16 +120,13 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
   }
 
   @Override
-  public void onCameraMoveStarted(int reason) {
+  public void onCameraMoveStarted(final int reason) {
     if (!idle) {
       return;
     }
     idle = false;
-
-    // deprecated API
-    if (onCameraMoveStartedListener != null) {
-      onCameraMoveStartedListener.onCameraMoveStarted(reason);
-    }
+    moveStartedReason = reason;
+    handler.post(onCameraMoveStartedRunnable);
 
     // new API
     if (!onCameraMoveStarted.isEmpty()) {
@@ -66,7 +138,7 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
 
   @Override
   public void onCameraMove() {
-    // deprecated API
+    handler.post(onCameraMoveRunnable);
     if (onCameraMoveListener != null && !idle) {
       onCameraMoveListener.onCameraMove();
     }
@@ -81,7 +153,7 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
 
   @Override
   public void onCameraMoveCanceled() {
-    // deprecated API
+    handler.post(onCameraMoveCancelRunnable);
     if (onCameraMoveCanceledListener != null && !idle) {
       onCameraMoveCanceledListener.onCameraMoveCanceled();
     }
@@ -98,7 +170,7 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
   public void onCameraIdle() {
     if (!idle) {
       idle = true;
-      // deprecated API
+      handler.post(onCameraIdleRunnable);
       if (onCameraIdleListener != null) {
         onCameraIdleListener.onCameraIdle();
       }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
index 01c6da4971..0c11a4220e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
@@ -11,6 +11,9 @@ import android.view.ViewGroup;
 
 import com.mapbox.mapboxsdk.utils.MapFragmentUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Fragment wrapper around a map view.
  * <p>
@@ -25,10 +28,11 @@ import com.mapbox.mapboxsdk.utils.MapFragmentUtils;
  *
  * @see #getMapAsync(OnMapReadyCallback)
  */
-public final class MapFragment extends Fragment {
+public final class MapFragment extends Fragment implements OnMapReadyCallback {
 
+  private final List<OnMapReadyCallback> mapReadyCallbackList = new ArrayList<>();
+  private MapboxMap mapboxMap;
   private MapView map;
-  private OnMapReadyCallback onMapReadyCallback;
 
   /**
    * Creates a default MapFragment instance
@@ -63,7 +67,9 @@ public final class MapFragment extends Fragment {
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     super.onCreateView(inflater, container, savedInstanceState);
     Context context = inflater.getContext();
-    return map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
+    map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
+    map.setVisibility(View.INVISIBLE);
+    return map;
   }
 
   /**
@@ -76,9 +82,16 @@ public final class MapFragment extends Fragment {
   public void onViewCreated(View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
     map.onCreate(savedInstanceState);
-    if (onMapReadyCallback != null) {
-      map.getMapAsync(onMapReadyCallback);
+    map.getMapAsync(this);
+  }
+
+  @Override
+  public void onMapReady(MapboxMap mapboxMap) {
+    this.mapboxMap = mapboxMap;
+    for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) {
+      onMapReadyCallback.onMapReady(mapboxMap);
     }
+    map.setVisibility(View.VISIBLE);
   }
 
   /**
@@ -144,6 +157,7 @@ public final class MapFragment extends Fragment {
   public void onDestroyView() {
     super.onDestroyView();
     map.onDestroy();
+    mapReadyCallbackList.clear();
   }
 
   /**
@@ -152,10 +166,10 @@ public final class MapFragment extends Fragment {
    * @param onMapReadyCallback The callback to be invoked.
    */
   public void getMapAsync(@NonNull final OnMapReadyCallback onMapReadyCallback) {
-    if (map == null) {
-      this.onMapReadyCallback = onMapReadyCallback;
+    if (mapboxMap == null) {
+      mapReadyCallbackList.add(onMapReadyCallback);
     } else {
-      map.getMapAsync(onMapReadyCallback);
+      onMapReadyCallback.onMapReady(mapboxMap);
     }
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index 0fea5ce0ff..6424de342e 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -550,7 +550,7 @@ final class MapGestureDetector {
         return super.onScale(detector);
       }
 
-      wasZoomingIn = (Math.log(detector.getScaleFactor()) / Math.log(Math.PI / 2)) >= 0;
+      wasZoomingIn = (Math.log(detector.getScaleFactor()) / Math.log(Math.PI / 2)) > 0;
       if (tiltGestureOccurred) {
         return false;
       }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index bf98e6bbc1..9525d48820 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -712,19 +712,21 @@ public final class MapboxMap {
    * @param callback the callback to be invoked when an animation finishes or is canceled
    */
   public final void moveCamera(final CameraUpdate update, final MapboxMap.CancelableCallback callback) {
-    new Handler().post(new Runnable() {
-      @Override
-      public void run() {
-        transform.moveCamera(MapboxMap.this, update, callback);
-        // MapChange.REGION_DID_CHANGE_ANIMATED is not called for `jumpTo`
-        // invalidate camera position to provide OnCameraChange event.
-        invalidateCameraPosition();
-
-        if (callback != null) {
-          callback.onFinish();
+    transform.moveCamera(MapboxMap.this, update, callback);
+    // MapChange.REGION_DID_CHANGE_ANIMATED is not called for `jumpTo`
+    // invalidate camera position to provide OnCameraChange event.
+    invalidateCameraPosition();
+
+    if (callback != null) {
+      new Handler().post(new Runnable() {
+        @Override
+        public void run() {
+          if (callback != null) {
+            callback.onFinish();
+          }
         }
-      }
-    });
+      });
+    }
   }
 
   /**
@@ -848,12 +850,7 @@ public final class MapboxMap {
     if (durationMs <= 0) {
       throw new IllegalArgumentException("Null duration passed into easeCamera");
     }
-    new Handler().post(new Runnable() {
-      @Override
-      public void run() {
-        transform.easeCamera(MapboxMap.this, update, durationMs, easingInterpolator, callback, isDismissable);
-      }
-    });
+    transform.easeCamera(MapboxMap.this, update, durationMs, easingInterpolator, callback, isDismissable);
   }
 
   /**
@@ -923,12 +920,8 @@ public final class MapboxMap {
     if (durationMs <= 0) {
       throw new IllegalArgumentException("Null duration passed into animageCamera");
     }
-    new Handler().post(new Runnable() {
-      @Override
-      public void run() {
-        transform.animateCamera(MapboxMap.this, update, durationMs, callback);
-      }
-    });
+
+    transform.animateCamera(MapboxMap.this, update, durationMs, callback);
   }
 
   /**
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
index 2719d7f016..34be958329 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
@@ -725,9 +725,12 @@ public class MapboxMapOptions implements Parcelable {
   }
 
   /**
-   * Set the font-family for generating glyphs locally for ideographs in the ‘CJK Unified Ideographs’
+   * Set the font family for generating glyphs locally for ideographs in the ‘CJK Unified Ideographs’
    * and ‘Hangul Syllables’ ranges.
    *
+   * The font family argument is passed to {@link android.graphics.Typeface#create(String, int)}.
+   * Default system fonts are defined in '/system/etc/fonts.xml'
+   *
    * @param fontFamily font family for local ideograph generation.
    * @return This
    */
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
index 6c90cd95ec..c072ec8237 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java
@@ -11,6 +11,9 @@ import android.view.ViewGroup;
 
 import com.mapbox.mapboxsdk.utils.MapFragmentUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Support Fragment wrapper around a map view.
  * <p>
@@ -25,10 +28,11 @@ import com.mapbox.mapboxsdk.utils.MapFragmentUtils;
  *
  * @see #getMapAsync(OnMapReadyCallback)
  */
-public class SupportMapFragment extends Fragment {
+public class SupportMapFragment extends Fragment implements OnMapReadyCallback {
 
+  private final List<OnMapReadyCallback> mapReadyCallbackList = new ArrayList<>();
+  private MapboxMap mapboxMap;
   private MapView map;
-  private OnMapReadyCallback onMapReadyCallback;
 
   /**
    * Creates a default MapFragment instance
@@ -63,7 +67,9 @@ public class SupportMapFragment extends Fragment {
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     super.onCreateView(inflater, container, savedInstanceState);
     Context context = inflater.getContext();
-    return map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
+    map = new MapView(context, MapFragmentUtils.resolveArgs(context, getArguments()));
+    map.setVisibility(View.INVISIBLE);
+    return map;
   }
 
   /**
@@ -76,9 +82,16 @@ public class SupportMapFragment extends Fragment {
   public void onViewCreated(View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
     map.onCreate(savedInstanceState);
-    if (onMapReadyCallback != null) {
-      map.getMapAsync(onMapReadyCallback);
+    map.getMapAsync(this);
+  }
+
+  @Override
+  public void onMapReady(MapboxMap mapboxMap) {
+    this.mapboxMap = mapboxMap;
+    for (OnMapReadyCallback onMapReadyCallback : mapReadyCallbackList) {
+      onMapReadyCallback.onMapReady(mapboxMap);
     }
+    map.setVisibility(View.VISIBLE);
   }
 
   /**
@@ -144,6 +157,7 @@ public class SupportMapFragment extends Fragment {
   public void onDestroyView() {
     super.onDestroyView();
     map.onDestroy();
+    mapReadyCallbackList.clear();
   }
 
   /**
@@ -152,10 +166,10 @@ public class SupportMapFragment extends Fragment {
    * @param onMapReadyCallback The callback to be invoked.
    */
   public void getMapAsync(@NonNull final OnMapReadyCallback onMapReadyCallback) {
-    if (map == null) {
-      this.onMapReadyCallback = onMapReadyCallback;
+    if (mapboxMap == null) {
+      mapReadyCallbackList.add(onMapReadyCallback);
     } else {
-      map.getMapAsync(onMapReadyCallback);
+      onMapReadyCallback.onMapReady(mapboxMap);
     }
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
index 16c45ebea2..0d3f0d5e5b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -1,6 +1,7 @@
 package com.mapbox.mapboxsdk.maps;
 
 import android.graphics.PointF;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
@@ -82,8 +83,15 @@ final class Transform implements MapView.OnMapChangedListener {
     if (change == REGION_DID_CHANGE_ANIMATED) {
       updateCameraPosition(invalidateCameraPosition());
       if (cameraCancelableCallback != null) {
-        cameraCancelableCallback.onFinish();
-        cameraCancelableCallback = null;
+        new Handler().post(new Runnable() {
+          @Override
+          public void run() {
+            if (cameraCancelableCallback != null) {
+              cameraCancelableCallback.onFinish();
+              cameraCancelableCallback = null;
+            }
+          }
+        });
       }
       cameraChangeDispatcher.onCameraIdle();
       mapView.removeOnMapChangedListener(this);
@@ -175,8 +183,15 @@ final class Transform implements MapView.OnMapChangedListener {
     // notify animateCamera and easeCamera about cancelling
     if (cameraCancelableCallback != null) {
       cameraChangeDispatcher.onCameraIdle();
-      cameraCancelableCallback.onCancel();
-      cameraCancelableCallback = null;
+      new Handler().post(new Runnable() {
+        @Override
+        public void run() {
+          if (cameraCancelableCallback != null) {
+            cameraCancelableCallback.onCancel();
+            cameraCancelableCallback = null;
+          }
+        }
+      });
     }
 
     // cancel ongoing transitions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
index aa7934ec1e..3fe3c7b40d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
@@ -33,7 +33,6 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.constants.MyBearingTracking;
 import com.mapbox.mapboxsdk.constants.MyLocationTracking;
 import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.location.LocationSource;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.Projection;
 import com.mapbox.services.android.telemetry.location.LocationEngine;
@@ -162,7 +161,7 @@ public class MyLocationView extends View {
   }
 
   @Deprecated
-  public void init(LocationSource locationSource) {
+  public void init(LocationEngine locationSource) {
     this.locationEngine = locationSource;
   }