Cherry pick v5.0.2 changes (#8586)

* [android] execute resource transform callback on the right thread

* [android] allow resetting of resource transform callback

* update CHANGELOG for v5.0.2

* [android] - correct anchoring when Icon is updated (#8519)

2 files changed, 10 insertions, 0 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
index 220d3322cb..30336d4ebd 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
@@ -390,6 +390,15 @@ public class MarkerView extends Marker {
   }
 
   /**
+   * Invalidates the MarkerView resulting in remeasuring the View.
+   */
+  void invalidate() {
+    width = height = 0;
+    offsetX = offsetY = MapboxConstants.UNMEASURED;
+    markerViewManager.invalidateViewMarkersInVisibleRegion();
+  }
+
+  /**
    * Get the String representation of a MarkerView.
    *
    * @return the String representation.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
index 315e12d280..bb51f3bfc2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
@@ -232,6 +232,7 @@ public class MarkerViewManager implements MapView.OnMapChangedListener {
     View convertView = markerViewMap.get(markerView);
     if (convertView != null && convertView instanceof ImageView) {
       ((ImageView) convertView).setImageBitmap(markerView.getIcon().getBitmap());
+      markerView.invalidate();
     }
   }