[components] Merge https://github.com/mozilla-mobile/android-components/pull/8236