Merge branch 'master' into update_new_blocking_categories

components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml

@@ -4,5 +4,5 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ac="http://schemas.android.com/apk/res-auto">
     <item android:drawable="@drawable/mozac_ic_lock" ac:state_site_secure="true" />
-    <item android:drawable="@drawable/mozac_ic_globe" />
+    <item android:drawable="@drawable/mozac_ic_broken_lock" />
 </selector>

docs/changelog.md

@@ -25,6 +25,9 @@ permalink: /changelog/
   * Added: `Session#trackersLoaded` A list of `Tracker`s that could be blocked but has been loaded in this session.
   * Added: `Session#Observer#onTrackerLoaded` Notifies that a tracker that could be blocked has been loaded.
 
+* **browser-toolbar**
+  * HTTP sites are now marked as insecure with a broken padlock icon, rather than a globe icon. Apps can revert to the globe icon by using a custom `BrowserToolbar.siteSecurityIcon`.
+
 # 8.0.0
 
 * [Commits](https://github.com/mozilla-mobile/android-components/compare/v7.0.0...v8.0.0)
@@ -61,7 +64,7 @@ permalink: /changelog/
     onTabsReceiver = { from, tabs -> /* Do cool things here! */ }
   )
   ```
-  
+
 * **feature-media**
   * `MediaFeature` is no longer showing a notification for playing media with a very short duration.
   * Lowererd priority of media notification channel to avoid the media notification makign any sounds itself.