[fenix] For https://github.com/mozilla-mobile/fenix/issues/5694 & https://github...