diff --git a/desktop/app/src/sandy-chrome/appinspect/LaunchEmulator.tsx b/desktop/app/src/sandy-chrome/appinspect/LaunchEmulator.tsx
index 56b54ee5b..dde7d8e4c 100644
--- a/desktop/app/src/sandy-chrome/appinspect/LaunchEmulator.tsx
+++ b/desktop/app/src/sandy-chrome/appinspect/LaunchEmulator.tsx
@@ -76,7 +76,9 @@ export const LaunchEmulatorDialog = withTrackingScope(
     }, [iosEnabled, getSimulators, store]);
 
     const items = [
-      ...(androidEmulators.length > 0 ? [<AndroidOutlined />] : []),
+      ...(androidEmulators.length > 0
+        ? [<AndroidOutlined key="android logo" />]
+        : []),
       ...androidEmulators.map((name) => {
         const launch = (coldBoot: boolean) => {
           launchEmulator(name, coldBoot)
@@ -111,7 +113,7 @@ export const LaunchEmulatorDialog = withTrackingScope(
           </Dropdown.Button>
         );
       }),
-      ...(iosEmulators.length > 0 ? [<AppleOutlined />] : []),
+      ...(iosEmulators.length > 0 ? [<AppleOutlined key="ios logo" />] : []),
       ...iosEmulators.map((device) => (
         <Button
           key={device.udid}
diff --git a/desktop/flipper-plugin/src/plugin/PluginBase.tsx b/desktop/flipper-plugin/src/plugin/PluginBase.tsx
index 9fbb1c76d..9a4376e63 100644
--- a/desktop/flipper-plugin/src/plugin/PluginBase.tsx
+++ b/desktop/flipper-plugin/src/plugin/PluginBase.tsx
@@ -115,6 +115,7 @@ export abstract class BasePluginInstance {
   importHandler?: StateImportHandler;
 
   menuEntries: NormalizedMenuEntry[] = [];
+  logListeners: Symbol[] = [];
 
   constructor(
     flipperLib: FlipperLib,
@@ -139,9 +140,9 @@ export abstract class BasePluginInstance {
         return realDevice.connected.get();
       },
       deviceType: realDevice.deviceType,
-
-      onLogEntry(cb) {
+      onLogEntry: (cb) => {
         const handle = realDevice.addLogListener(cb);
+        this.logListeners.push(handle);
         return () => {
           realDevice.removeLogListener(handle);
         };
@@ -265,6 +266,9 @@ export abstract class BasePluginInstance {
   destroy() {
     this.assertNotDestroyed();
     this.deactivate();
+    this.logListeners.splice(0).forEach((handle) => {
+      this.device.realDevice.removeLogListener(handle);
+    });
     this.events.emit('destroy');
     this.destroyed = true;
   }
diff --git a/desktop/plugins/logs/index.tsx b/desktop/plugins/logs/index.tsx
index aad737d7c..2a96bc294 100644
--- a/desktop/plugins/logs/index.tsx
+++ b/desktop/plugins/logs/index.tsx
@@ -497,6 +497,8 @@ export function devicePlugin(client: DevicePluginClient) {
   }
 
   function clearLogs() {
+    // Non public Android specific api
+    (client.device.realDevice as any)?.clearLogs?.();
     entries.set([]);
     rows.set([]);
     highlightedRows.set(new Set());