This patch reintroduces the changes from PR https://github.com/mozilla-mobile/android-components/pull/8360 that we reverted in PR https://github.com/mozilla-mobile/android-components/pull/8623. Now the issues in Fenix are resolved and we can land this again.