Fix build after merge

app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

@@ -105,7 +105,6 @@ import org.mozilla.fenix.components.toolbar.ToolbarIntegration
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.downloads.DynamicDownloadDialog
-import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.accessibilityManager
 import org.mozilla.fenix.ext.breadcrumb
 import org.mozilla.fenix.ext.components
@@ -1327,17 +1326,4 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             }
         }
     }
-
-    // This method is called in response to native web extension messages from
-    // content scripts (e.g the reader view extension). By the time these
-    // messages are processed the fragment/view may no longer be attached.
-    internal fun safeInvalidateBrowserToolbarView() {
-        runIfFragmentIsAttached {
-            val toolbarView = _browserToolbarView
-            if (toolbarView != null) {
-                toolbarView.view.invalidateActions()
-                toolbarView.toolbarIntegration.invalidateMenu()
-            }
-        }
-    }
 }

app/src/main/java/org/mozilla/fenix/components/Components.kt

@@ -17,6 +17,7 @@ import mozilla.components.feature.sitepermissions.SitePermissionsStorage
 import mozilla.components.lib.publicsuffixlist.PublicSuffixList
 import mozilla.components.support.migration.state.MigrationStore
 import io.github.forkmaintainers.iceraven.components.PagedAddonCollectionProvider
+import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.perf.StrictModeManager

docs/metrics.md

@@ -28,8 +28,8 @@ an hashed version of the Google Advertising ID.
 
 **Bugs related to this ping:**
 
-- <https://bugzilla.mozilla.com/1538011/>
-- <https://bugzilla.mozilla.com/1501822/>
+- 1538011
+- 1501822
 
 The following metrics are added to the ping: