fix(notifications) remove dead code

2023-02-14 10:11:08 +01:00
315 changed files with 7318 additions and 10259 deletions
--- a/7
+++ b/7
@ -44,8 +44,12 @@ deploy-appbundle:
 	cp \
 		$(BUILD_DIR)/app.bundle.min.js \
 		$(BUILD_DIR)/app.bundle.min.js.map \
+		$(BUILD_DIR)/do_external_connect.min.js \
+		$(BUILD_DIR)/do_external_connect.min.js.map \
 		$(BUILD_DIR)/external_api.min.js \
 		$(BUILD_DIR)/external_api.min.js.map \
+		$(BUILD_DIR)/dial_in_info_bundle.min.js \
+		$(BUILD_DIR)/dial_in_info_bundle.min.js.map \
 		$(BUILD_DIR)/alwaysontop.min.js \
 		$(BUILD_DIR)/alwaysontop.min.js.map \
 		$(OUTPUT_DIR)/analytics-ga.js \
@ -66,6 +70,7 @@ deploy-lib-jitsi-meet:
 		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.js \
 		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.map \
 		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.e2ee-worker.js \
+		$(LIBJITSIMEET_DIR)/connection_optimization/external_connect.js \
 		$(LIBJITSIMEET_DIR)/modules/browser/capabilities.json \
 		$(DEPLOY_DIR)

@ -126,7 +131,7 @@ dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-mode

 source-package:
 	mkdir -p source_package/jitsi-meet/css && \
-	cp -r *.js *.html resources/*.txt favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
+	cp -r *.js *.html resources/*.txt connection_optimization favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
 	cp css/all.css source_package/jitsi-meet/css && \
 	(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
 	rm -rf source_package
--- a/app.js
+++ b/app.js
@ -33,6 +33,17 @@ window.APP = {
    API,
    conference,

+    // Used by do_external_connect.js if we receive the attach data after
+    // connect was already executed. status property can be 'initialized',
+    // 'ready', or 'connecting'. We are interested in 'ready' status only which
+    // means that connect was executed but we have to wait for the attach data.
+    // In status 'ready' handler property will be set to a function that will
+    // finish the connect process when the attach data or error is received.
+    connect: {
+        handler: null,
+        status: 'initialized'
+    },
+
    // Used for automated performance tests.
    connectionTimes: {
        'index.loaded': window.indexLoadedTime
--- a/conference.js
+++ b/conference.js
@ -141,7 +141,7 @@ import {
    showNotification,
    showWarningNotification
 } from './react/features/notifications';
-import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay/actions';
+import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay';
 import { suspendDetected } from './react/features/power-monitor';
 import { initPrejoin, makePrecallTest, setJoiningInProgress } from './react/features/prejoin/actions';
 import { isPrejoinPageVisible } from './react/features/prejoin/functions';
@ -153,7 +153,6 @@ import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise'
 import { endpointMessageReceived } from './react/features/subtitles';
 import { handleToggleVideoMuted } from './react/features/toolbox/actions.any';
 import { muteLocal } from './react/features/video-menu/actions.any';
-import { setIAmVisitor } from './react/features/visitors/actions';
 import UIEvents from './service/UI/UIEvents';

 const logger = Logger.getLogger(__filename);
@ -343,8 +342,6 @@ class ConferenceConnector {
        case JitsiConferenceErrors.REDIRECTED: {
            generateVisitorConfig(APP.store.getState(), params);

-            APP.store.dispatch(setIAmVisitor(true));
-
            connection.disconnect().then(() => {
                connect(this._conference.roomName).then(con => {
                    const localTracks = getLocalTracks(APP.store.getState()['features/base/tracks']);
--- a/config.js
+++ b/config.js
@ -46,9 +46,9 @@ var config = {
    },

    // BOSH URL. FIXME: use XEP-0156 to discover it.
-    bosh: 'https://jitsi-meet.example.com/' + subdir + 'http-bind',
+    bosh: '//jitsi-meet.example.com/' + subdir + 'http-bind',

-    // Websocket URL (XMPP)
+    // Websocket URL
    // websocket: 'wss://jitsi-meet.example.com/' + subdir + 'xmpp-websocket',

    // The real JID of focus participant - can be overridden here
@ -56,19 +56,6 @@ var config = {
    // https://github.com/jitsi/jitsi-meet/issues/7376
    // focusUserJid: 'focus@auth.jitsi-meet.example.com',

-    // Options related to the bridge (colibri) data channel
-    bridgeChannel: {
-        // If the backend advertises multiple colibri websockets, this options allows
-        // to filter some of them out based on the domain name. We use the first URL
-        // which does not match ignoreDomain, falling back to the first one that matches
-        // ignoreDomain. Has no effect if undefined.
-        // ignoreDomain: 'example.com',
-
-        // Prefer SCTP (WebRTC data channels over the media path) over a colibri websocket.
-        // If SCTP is available in the backend it will be used instead of a WS. Defaults to
-        // false (SCTP is used only if available and no WS are available).
-        // preferSctp: false
-    },

    // Testing / experimental features.
    //
@ -1159,13 +1146,6 @@ var config = {
    //     }
    // },

-    // // The terms, privacy and help centre URL's.
-    // legalUrls: {
-    //     helpCentre: 'https://web-cdn.jitsi.net/faq/meet-faq.html',
-    //     privacy: 'https://jitsi.org/meet/privacy',
-    //     terms: 'https://jitsi.org/meet/terms'
-    // },
-
    // A property to disable the right click context menu for localVideo
    // the menu has option to flip the locally seen video for local presentations
    // disableLocalVideoFlip: false,
@ -1385,6 +1365,7 @@ var config = {
     dialOutRegionUrl
     disableRemoteControl
     displayJids
+     externalConnectUrl
     e2eeLabels
     firefox_fake_device
     googleApiApplicationClientID
--- a/connection.js
+++ b/connection.js
@ -32,6 +32,54 @@ const logger = Logger.getLogger(__filename);
 */
 export const DISCO_JIBRI_FEATURE = 'http://jitsi.org/protocol/jibri';

+/**
+ * Checks if we have data to use attach instead of connect. If we have the data
+ * executes attach otherwise check if we have to wait for the data. If we have
+ * to wait for the attach data we are setting handler to APP.connect.handler
+ * which is going to be called when the attach data is received otherwise
+ * executes connect.
+ *
+ * @param {string} [id] user id
+ * @param {string} [password] password
+ * @param {string} [roomName] the name of the conference.
+ */
+function checkForAttachParametersAndConnect(id, password, connection) {
+    if (window.XMPPAttachInfo) {
+        APP.connect.status = 'connecting';
+
+        // When connection optimization is not deployed or enabled the default
+        // value will be window.XMPPAttachInfo.status = "error"
+        // If the connection optimization is deployed and enabled and there is
+        // a failure the value will be window.XMPPAttachInfo.status = "error"
+        if (window.XMPPAttachInfo.status === 'error') {
+            connection.connect({
+                id,
+                password
+            });
+
+            return;
+        }
+
+        const attachOptions = window.XMPPAttachInfo.data;
+
+        if (attachOptions) {
+            connection.attach(attachOptions);
+            delete window.XMPPAttachInfo.data;
+        } else {
+            connection.connect({
+                id,
+                password
+            });
+        }
+    } else {
+        APP.connect.status = 'ready';
+        APP.connect.handler
+            = checkForAttachParametersAndConnect.bind(
+                null,
+                id, password, connection);
+    }
+}
+
 /**
 * Try to open connection using provided credentials.
 * @param {string} [id]
@ -134,10 +182,7 @@ export async function connect(id, password) {
            APP.store.dispatch(setPrejoinDisplayNameRequired());
        }

-        connection.connect({
-            id,
-            password
-        });
+        checkForAttachParametersAndConnect(id, password, connection);
    });
 }

--- a/connection_optimization/.eslintrc.js
+++ b/connection_optimization/.eslintrc.js
@ -0,0 +1,3 @@
+module.exports = {
+    'extends': '../react/.eslintrc.js'
+};
--- a/connection_optimization/connection_optimization.html
+++ b/connection_optimization/connection_optimization.html
--- a/connection_optimization/do_external_connect.js
+++ b/connection_optimization/do_external_connect.js
@ -0,0 +1,86 @@
+/* global config, createConnectionExternally */
+
+import getRoomName from '../react/features/base/config/getRoomName';
+import { parseURLParams } from '../react/features/base/util/parseURLParams';
+
+/**
+ * Implements external connect using createConnectionExternally function defined
+ * in external_connect.js for Jitsi Meet. Parses the room name and JSON Web
+ * Token (JWT) from the URL and executes createConnectionExternally.
+ *
+ * NOTE: If you are using lib-jitsi-meet without Jitsi Meet, you should use this
+ * file as reference only because the implementation is Jitsi Meet-specific.
+ *
+ * NOTE: For optimal results this file should be included right after
+ * external_connect.js.
+ */
+
+if (typeof createConnectionExternally === 'function') {
+    // URL params have higher priority than config params.
+    // Do not use external connect if websocket is enabled.
+    let url
+        = parseURLParams(window.location, true, 'hash')[
+                'config.externalConnectUrl']
+            || config.websocket ? undefined : config.externalConnectUrl;
+    const isRecorder
+        = parseURLParams(window.location, true, 'hash')['config.iAmRecorder'];
+
+    let roomName;
+
+    if (url && (roomName = getRoomName()) && !isRecorder) {
+        url += `?room=${roomName}`;
+
+        const token = parseURLParams(window.location, true, 'search').jwt;
+
+        if (token) {
+            url += `&token=${token}`;
+        }
+
+        createConnectionExternally(
+            url,
+            connectionInfo => {
+                // Sets that global variable to be used later by connect method
+                // in connection.js.
+                window.XMPPAttachInfo = {
+                    status: 'success',
+                    data: connectionInfo
+                };
+                checkForConnectHandlerAndConnect();
+            },
+            errorCallback);
+    } else {
+        errorCallback();
+    }
+} else {
+    errorCallback();
+}
+
+/**
+ * Check if connect from connection.js was executed and executes the handler
+ * that is going to finish the connect work.
+ *
+ * @returns {void}
+ */
+function checkForConnectHandlerAndConnect() {
+    window.APP
+        && window.APP.connect.status === 'ready'
+        && window.APP.connect.handler();
+}
+
+/**
+ * Implements a callback to be invoked if anything goes wrong.
+ *
+ * @param {Error} error - The specifics of what went wrong.
+ * @returns {void}
+ */
+function errorCallback(error) {
+    // The value of error is undefined if external connect is disabled.
+    error && console.warn(error);
+
+    // Sets that global variable to be used later by connect method in
+    // connection.js.
+    window.XMPPAttachInfo = {
+        status: 'error'
+    };
+    checkForConnectHandlerAndConnect();
+}
--- a/css/_audio-preview.scss
+++ b/css/_audio-preview.scss
@ -4,7 +4,7 @@
    &-content {
        position: relative;
        right: auto;
-        margin-bottom: 4px;
+        margin-bottom: 8px;
        max-height: 456px;
        overflow: auto;
        width: 300px;
@ -22,7 +22,11 @@
    }

    &-entry-text {
+        display: inline-block;
+        text-overflow: ellipsis;
        max-width: 213px;
+        overflow: hidden;
+        white-space: nowrap;

        &.left-margin {
            margin-left: 36px;
--- a/css/_jiti.scss
+++ b/css/_jiti.scss
@ -1,67 +0,0 @@
-@keyframes rotateAroundY {
-    from { transform: rotateY(0deg); }
-    to   { transform: rotateY(360deg); }
-}
-
-@keyframes rainbowRoad {
-    to {
-        background-position: 400% 0 !important;
-    }
-}
-
-body {
-    font-family: "Comic Sans MS", "Comic Sans", sans-serif !important;
-}
-
-a {
-    background: linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%) !important;
-    -webkit-background-clip: text !important;
-    -webkit-text-fill-color: transparent !important;
-    -moz-background-clip: text !important;
-    -moz-text-fill-color: transparent !important;
-    animation: rainbowRoad 8s linear infinite !important;
-}
-
-a:hover {
-
-}
-
-.dominant-speaker {
-    box-shadow: inset 0px 0px 0px 4px rgba(255,0,255,0.33) !important;
-}
-
-.display-avatar-only {
-    background-image: url("");
-}
-
-.videocontainer:nth-child(odd) {
-    transform: rotate(1.5deg);
-}
-
-.videocontainer:nth-child(even) {
-    transform: rotate(-1.3deg);
-}
-
-#largeVideoContainer.videocontainer {
-    transform: none;
-}
-
-.sideToolbarContainer {
-    transform: rotate(-1.1deg);
-}
-
-.displayname:before {
-    content: "♡︎ ";
-}
-
-.displayname:after {
-    content: " ♡︎";
-}
-
-.avatar, .userAvatar {
-    transform: rotateY(0deg);
-}
-
-.avatar:hover, .userAvatar:hover {
-    animation: rotateAroundY 3.6s linear infinite;
-}
--- a/css/_meetings_list.scss
+++ b/css/_meetings_list.scss
@ -82,7 +82,6 @@
        }

        .left-column {
-            order: -1;
            display: flex;
            flex-direction: column;
            flex-grow: 0;
@ -93,7 +92,6 @@
        .right-column {
            display: flex;
            flex-direction: column;
-            align-items: flex-start;
            flex-grow: 1;
            padding-left: 16px;
            padding-top: 13px;
@ -101,11 +99,11 @@
        }

        .title {
-            font-size: 12px;
-            font-weight: 600;
-            line-height: 16px;
-            margin-bottom: 4px;
-        }
+                font-size: 12px;
+                font-weight: 600;
+                line-height: 16px;
+                padding-bottom: 4px;
+            }

        .subtitle {
            color: #5E6D7A;
@ -127,7 +125,8 @@
            cursor: pointer;
        }

-        &.with-click-handler:hover {
+        &.with-click-handler:hover,
+        &.with-click-handler:focus {
            background-color: #c7ddff;
        }

--- a/css/_polls.scss
+++ b/css/_polls.scss
@ -1,3 +1,3 @@
-.polls-panel {
+#polls-panel {
    height: calc(100% - 119px);
 }
--- a/css/_variables.scss
+++ b/css/_variables.scss
@ -201,6 +201,11 @@ $deepLinkingDialInConferenceIdPadding: inherit;
 $deepLinkingDialInConferenceIdBackgroundColor: inherit;
 $deepLinkingDialInConferenceIdBorderRadius: inherit;

+$deepLinkingDialInConferenceNameFontSize: inherit;
+$deepLinkingDialInConferenceNameLineHeight: inherit;
+$deepLinkingDialInConferenceNameMarginBottom: none;
+$deepLinkingDialInConferenceNameFontWeight: inherit;
+
 $deepLinkingDialInConferenceDescriptionFontSize: 0.8em;
 $deepLinkingDialInConferenceDescriptionLineHeight: inherit;
 $deepLinkingDialInConferenceDescriptionMarginBottom: none;
--- a/css/_video-preview.scss
+++ b/css/_video-preview.scss
@ -3,38 +3,49 @@
    display: inline-block;

    &-container {
-        max-height: 456px;
+        max-height: 344px;
+        background: $menuBG;
+        border-radius: 3px;
        overflow: auto;
-        margin-bottom: 4px;
-        position: relative;
-        right: auto;
+        padding: 8px;
+        margin-bottom: 8px;
    }

    &-entry {
        cursor: pointer;
-        height: 138px;
-        width: 244px;
+        height: 168px;
+        margin-bottom: 8px;
        position: relative;
-        margin: 0 7px 4px;
-        border-radius: 6px;
-        box-sizing: border-box;
-        overflow: hidden;
+        width: 284px;

        &:last-child {
            margin-bottom: 0;
        }

        &--selected {
-            border: 2px solid #4687ED;
+            border: 3px solid #31B76A;
+            border-radius: 3px;
+            cursor: default;
+            height: 162px;
+            width: 278px;
        }
    }

    &-video {
+        border-radius: 3px;
        height: 100%;
        object-fit: cover;
        width: 100%;
    }

+    &-overlay {
+        background: rgba(42, 58, 75, 0.6);
+        height: 100%;
+        position: absolute;
+        width: 100%;
+        z-index: 1;
+    }
+
    &-error {
        align-items: center;
        display: flex;
@ -45,22 +56,23 @@
    }

    &-label {
+        bottom: 8px;
+        color: #fff;
        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        max-width: 100%;
-        padding: 8px;
+        width: 100%;
        z-index: 2;

+        &-container {
+            margin: 0 16px;
+        }
+
        &-text {
-            background-color: rgba(0, 0, 0, 0.7);
-            border-radius: 4px;
-            padding: 4px 8px;
-            color: #fff;
-            font-size: 12px;
-            line-height: 16px;
-            font-weight: 600;
+            background-color: #131519;
+            border-radius: 3px;
+            padding: 2px 8px;
+            font-size: 13px;
+            line-height: 20px;
+            margin: 0 auto;
            max-width: calc(100% - 16px);
            overflow: hidden;
            text-overflow: ellipsis;
@ -68,8 +80,8 @@
            white-space: nowrap;
        }
    }
-
-    &-checkbox-container {
-        padding: 10px 14px;
+    // Override @atlaskit/InlineDialog container which is made with styled components
+    & > div:nth-child(2) {
+        padding: 0;
    }
 }
--- a/css/_welcome_page.scss
+++ b/css/_welcome_page.scss
@ -90,7 +90,7 @@ body.welcome-page {
                    font-size: 14px;
                    padding-left: 10px;

-                    &.focus-visible {
+                    &:focus {
                        outline: auto 2px #005fcc;
                    }
                }
@ -167,7 +167,7 @@ body.welcome-page {
            margin: 4px;
            display: $welcomePageTabButtonsDisplay;

-            [role="tab"] {
+            .tab {
                background-color: #c7ddff;
                border-radius: 7px;
                cursor: pointer;
@ -176,10 +176,8 @@ body.welcome-page {
                margin: 2px;
                padding: 7px 0;
                text-align: center;
-                color: inherit;
-                border: 0;

-                &[aria-selected="true"] {
+                &.selected {
                    background-color: #FFF;
                }
            }
--- a/css/deep-linking/_mobile.scss
+++ b/css/deep-linking/_mobile.scss
@ -67,13 +67,6 @@
            font-size: 1em;
        }

-
-        .dial-in-conference-id {
-            text-align: center;
-            min-width: 200px;
-            margin-top: 40px;
-        }
-
        .dial-in-conference-id {
            margin: $deepLinkingDialInConferenceIdMargin;
            padding: $deepLinkingDialInConferenceIdPadding;
@ -81,12 +74,24 @@
            border-radius: $deepLinkingDialInConferenceIdBorderRadius;
        }

+        .dial-in-conference-name {
+            font-size: $deepLinkingDialInConferenceNameFontSize;
+            line-height: $deepLinkingDialInConferenceNameLineHeight;
+            margin-bottom: $deepLinkingDialInConferenceNameMarginBottom;
+            font-weight: $deepLinkingDialInConferenceNameFontWeight;
+        }
+
        .dial-in-conference-description {
            font-size: $deepLinkingDialInConferenceDescriptionFontSize;
            line-height: $deepLinkingDialInConferenceDescriptionLineHeight;
            margin-bottom: $deepLinkingDialInConferenceDescriptionMarginBottom;
        }

+        .dial-in-conference-pin {
+            font-size: $deepLinkingDialInConferencePinFontSize;
+            line-height: $deepLinkingDialInConferencePinLineHeight;
+        }
+
        .toll-free-list {
            min-width: 80px;
        }
--- a/css/main.scss
+++ b/css/main.scss
@ -33,6 +33,7 @@ $flagsImagePath: "../images/";
@import 'reload_overlay/reload_overlay';
@import 'mini_toolbox';
@import 'modals/desktop-picker/desktop-picker';
+@import 'modals/device-selection/device-selection';
@import 'modals/dialog';
@import 'modals/embed-meeting/embed-meeting';
@import 'modals/feedback/feedback';
@ -94,9 +95,3 @@ $flagsImagePath: "../images/";
@import 'notifications';

 /* Modules END */
-
-/* Jeet crew BEGIN */
-
-@import 'jiti';
-
-/* Jeet crew END */
--- a/css/modals/desktop-picker/_desktop-picker.scss
+++ b/css/modals/desktop-picker/_desktop-picker.scss
@ -63,8 +63,3 @@
 .desktop-source-preview-image-container {
    padding: 10px;
 }
-
-.desktop-picker-tabs-container {
-    width: 65%;
-    margin-top: 3px;
-}
--- a/css/modals/device-selection/_device-selection.scss
+++ b/css/modals/device-selection/_device-selection.scss
@ -0,0 +1,148 @@
+.device-selection {
+    .device-selectors {
+        font-size: 14px;
+
+        > div {
+            display: block;
+            margin-bottom: 4px;
+        }
+
+        .device-selector-icon {
+            align-self: center;
+            color: inherit;
+            font-size: 20px;
+            margin-left: 3px;
+        }
+
+        .device-selector-label {
+            margin-bottom: 1px;
+        }
+
+        /* device-selector-trigger stylings attempt to mimic AtlasKit button */
+        .device-selector-trigger {
+            background-color: #0E1624;
+            border: 1px solid #455166;
+            border-radius: 5px;
+            display: flex;
+            height: 2.3em;
+            justify-content: space-between;
+            line-height: 2.3em;
+            overflow: hidden;
+            padding: 0 8px;
+        }
+        .device-selector-trigger-disabled {
+            .device-selector-trigger {
+                color: #a5adba;
+                cursor: default;
+            }
+        }
+
+        .device-selector-trigger-text {
+            overflow: hidden;
+            text-align: center;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 100%;
+        }
+    }
+
+    .device-selection-column {
+        box-sizing: border-box;
+        display: inline-block;
+        vertical-align: top;
+
+        &.column-selectors {
+            margin-left: 15px;
+            width: 45%;
+        }
+
+        &.column-video {
+            width: 50%;
+        }
+    }
+
+    .device-selection-video-container {
+        border-radius: 3px;
+        margin-bottom: 5px;
+
+        .video-input-preview {
+            margin-top: 2px;
+            position: relative;
+
+            > video {
+                border-radius: 3px;
+            }
+
+            .video-input-preview-error {
+                color: $participantNameColor;
+                display: none;
+                left: 0;
+                position: absolute;
+                right: 0;
+                text-align: center;
+                top: 50%;
+            }
+
+            &.video-preview-has-error {
+                background: black;
+
+                .video-input-preview-error {
+                    display: block;
+                }
+            }
+
+            .video-input-preview-display {
+                height: auto;
+                overflow: hidden;
+                width: 100%;
+            }
+        }
+    }
+
+    .audio-output-preview {
+        font-size: 14px;
+
+        a {
+            color: #6FB1EA;
+            cursor: pointer;
+            text-decoration: none;
+        }
+
+        a:hover {
+            color: #B3D4FF;
+        }
+    }
+
+    .audio-input-preview {
+        background: #1B2638;
+        border-radius: 5px;
+        height: 8px;
+
+        .audio-input-preview-level {
+            background: #75B1FF;
+            border-radius: 5px;
+            height: 100%;
+            -webkit-transition: width .1s ease-in-out;
+            -moz-transition: width .1s ease-in-out;
+            -o-transition: width .1s ease-in-out;
+            transition: width .1s ease-in-out;
+        }
+    }
+}
+
+.device-selection.video-hidden {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+
+    .column-selectors {
+        width: 100%;
+        margin-left: 0;
+    }
+
+    .column-video {
+        order: 1;
+        width: 100%;
+        margin-top: 8px;
+    }
+}
--- a/css/modals/feedback/_feedback.scss
+++ b/css/modals/feedback/_feedback.scss
@ -44,3 +44,61 @@
    -webkit-animation-timing-function: ease-in-out;
    animation-timing-function: ease-in-out
 }
+
+.feedback-dialog {
+    margin-bottom: 5px;
+
+    .details {
+        textarea {
+            min-height: 100px;
+        }
+    }
+
+    .input-control {
+        background-color: $feedbackInputBg;
+        color: $feedbackInputTextColor;
+
+        &::-webkit-input-placeholder {
+            color: $feedbackInputPlaceholderColor;
+        }
+        &::-moz-placeholder {  /* Firefox 19+ */
+            color: $feedbackInputPlaceholderColor;
+        }
+        &:-ms-input-placeholder {
+            color: $feedbackInputPlaceholderColor;
+        }
+    }
+
+    .rating {
+        line-height: 1.2;
+        margin-top: 10px;
+        text-align: center;
+
+        .star-label {
+            font-size: 14px;
+            height: 16px;
+        }
+
+        .star-btn {
+            color: inherit;
+            cursor: pointer;
+            display: inline-block;
+            font-size: 34px;
+            outline: none;
+            position: relative;
+            text-decoration: none;
+            @include transition(all .2s ease);
+
+            &.active,
+            &:hover,
+            &.starHover {
+                color: #36B37E;
+            };
+
+        }
+        .star-btn:focus,
+        .star-btn:active {
+            outline: 1px solid #B8C7E0;
+        }
+    }
+}
--- a/css/modals/invite/_info.scss
+++ b/css/modals/invite/_info.scss
@ -50,8 +50,6 @@
 }

 .dial-in-numbers-list {
-    max-width: 334px;
-    width: 100%;
    margin-top: 20px;
    font-size: 12px;
    line-height: 24px;
@ -61,6 +59,10 @@
        text-align: left;
    }

+    tr {
+        border-bottom: 1px solid #d1dbe8;
+    }
+
    .flag-cell {
        vertical-align: top;
        width: 30px;
@ -89,7 +91,6 @@
        font-weight: bold;
        list-style: none;
        vertical-align: top;
-        text-align: right;
    }

    li.toll-free:empty:before {
@ -118,6 +119,11 @@
        margin-top: 40px;
    }

+    .dial-in-conference-name,
+    .dial-in-conference-pin {
+        font-size: 18px;
+    }
+
    .dial-in-conference-description {
        margin: 12px;
    }
--- a/css/premeeting/_prejoin.scss
+++ b/css/premeeting/_prejoin.scss
@ -60,7 +60,6 @@

 .prejoin-input {
    margin-bottom: 16px;
-    width: 100%;

    & input {
        text-align: center;
--- a/debian/jitsi-meet-web.install
+++ b/debian/jitsi-meet-web.install
@ -8,6 +8,7 @@ sounds					/usr/share/jitsi-meet/
 fonts					/usr/share/jitsi-meet/
 images					/usr/share/jitsi-meet/
 lang					/usr/share/jitsi-meet/
+connection_optimization	/usr/share/jitsi-meet/
 resources/robots.txt	/usr/share/jitsi-meet/
 resources/*.sh			/usr/share/jitsi-meet/scripts/
 pwa-worker.js			/usr/share/jitsi-meet/
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@ -93,7 +93,7 @@ server {
    }

    # ensure all static content can always be found first
-    location ~ ^/(libs|css|static|images|fonts|lang|sounds|.well-known)/(.*)$
+    location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
    {
        add_header 'Access-Control-Allow-Origin' '*';
        alias /usr/share/jitsi-meet/$1/$2;
--- a/images/logo-deep-linking-mobile.png
+++ b/images/logo-deep-linking-mobile.png
--- a/images/logo-deep-linking.png
+++ b/images/logo-deep-linking.png
--- a/index.html
+++ b/index.html
@ -182,6 +182,8 @@
            'error', loadErrHandler, true /* capture phase type of listener */);
    </script>
    <script><!--#include virtual="/config.js" --></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
+    <!--#include virtual="connection_optimization/connection_optimization.html" -->
+    <script src="libs/do_external_connect.min.js?v=1"></script>
    <script><!--#include virtual="/interface_config.js" --></script>
    <script src="libs/lib-jitsi-meet.min.js?v=139"></script>
    <script src="libs/app.bundle.min.js?v=139"></script>
--- a/interface_config.js
+++ b/interface_config.js
@ -9,7 +9,7 @@
 */

 var interfaceConfig = {
-    APP_NAME: 'JitSea 🏴‍☠️',
+    APP_NAME: 'Jitsi Meet',
    AUDIO_LEVEL_PRIMARY_COLOR: 'rgba(255,255,255,0.4)',
    AUDIO_LEVEL_SECONDARY_COLOR: 'rgba(255,255,255,0.2)',

--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -389,7 +389,7 @@ PODS:
  - react-native-video/Video (6.0.0-alpha.1):
    - PromisesSwift
    - React-Core
-  - react-native-webrtc (106.0.6):
+  - react-native-webrtc (106.0.5):
    - JitsiWebRTC (~> 106.0.0)
    - React-Core
  - react-native-webview (11.15.1):
@ -754,7 +754,7 @@ SPEC CHECKSUMS:
  react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
  react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
-  react-native-webrtc: 22ac6c64a1e38552bb173dde81ffea6979a58ef3
+  react-native-webrtc: ef315d8adb68e78298b22100377d12ef168efdb5
  react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
  React-perflogger: 0458a87ea9a7342079e7a31b0d32b3734fb8415f
  React-RCTActionSheet: 22538001ea2926dea001111dd2846c13a0730bc9
--- a/lang/languages.json
+++ b/lang/languages.json
@ -7,7 +7,6 @@
    "cs": "Čeština",
    "da": "Dansk",
    "de": "Deutsch",
-    "dsb": "Dolnoserbšćina",
    "el": "Ελληνικά",
    "en": "English",
    "enGB": "English (United Kingdom)",
--- a/lang/main-de.json
+++ b/lang/main-de.json
@ -184,21 +184,13 @@
    "deepLinking": {
        "appNotInstalled": "Sie benötigen die „{{app}}“-App, um der Konferenz auf dem Smartphone beizutreten.",
        "description": "Nichts passiert? Wir haben versucht, die Konferenz in {{app}} zu öffnen. Versuchen Sie es erneut oder treten Sie der Konferenz in {{app}} im Web bei.",
-        "descriptionNew": "Nichts passiert? Wir haben versucht, die Konferenz in {{app}} zu öffnen. <br /><br /> Versuchen Sie es erneut oder treten Sie der Konferenz im Web bei.",
        "descriptionWithoutWeb": "Ist nichts passiert? Wir haben versucht, Ihre Besprechung in der „{{app}}“-Desktop-App zu starten.",
        "downloadApp": "App herunterladen",
-        "downloadMobileApp": "Aus dem App Store herunterladen",
        "ifDoNotHaveApp": "Wenn Sie die App noch nicht haben:",
        "ifHaveApp": "Wenn Sie die App bereits haben:",
        "joinInApp": "Mit der App am Meeting teilnehmen",
-        "joinInAppNew": "Mit der App",
-        "joinInBrowser": "Im Browser",
-        "launchMeetingLabel": "Wie möchten Sie an der Konferenz teilnehmen?",
        "launchWebButton": "Im Web öffnen",
-        "noMobileApp": "Sie haben die App noch nicht installiert?",
-        "termsAndConditions": "Indem Sie fortfahren, stimmen Sie underen<a href='{{termsAndConditionsLink}}' rel='noopener noreferrer' target='_blank'>Nutzungsbedingungen</a> zu.",
        "title": "Die Konferenz wird in {{app}} geöffnet …",
-        "titleNew": "Konferenz starten ...",
        "tryAgainButton": "Erneut mit der nativen Applikation versuchen",
        "unsupportedBrowser": "Sie verwenden einen Browser, der noch nicht unterstützt wird."
    },
@ -211,12 +203,6 @@
        "microphonePermission": "Fehler beim Bezug der Mikrofon-Zugriffsberechtigungen"
    },
    "deviceSelection": {
-        "hid": {
-            "callControl": "Anrufsteuerung",
-            "connectedDevices": "Verbundene Geräte:",
-            "deleteDevice": "Gerät löschen",
-            "pairDevice": "Gerät verbinden"
-        },
        "noPermission": "Berechtigungen nicht erteilt",
        "previewUnavailable": "Keine Vorschau verfügbar",
        "selectADevice": "Ein Gerät wählen",
@ -240,9 +226,7 @@
        "WaitingForHostTitle": "Warten auf den Beginn der Konferenz …",
        "Yes": "Ja",
        "accessibilityLabel": {
-            "close": "Popup schließen",
-            "liveStreaming": "Livestream",
-            "sharingTabs": "Optionen zum Teilen"
+            "liveStreaming": "Livestream"
        },
        "add": "Hinzufügen",
        "addMeetingNote": "Notiz zu dieser Konferenz hinzufügen",
@ -454,11 +438,6 @@
        "veryBad": "Sehr schlecht",
        "veryGood": "Sehr gut"
    },
-    "filmstrip": {
-        "accessibilityLabel": {
-            "heading": "Videominiaturen"
-        }
-    },
    "giphy": {
        "noResults": "Keine Ergebnisse :(",
        "search": "GIPHY durchsuchen"
@ -772,7 +751,6 @@
        "headings": {
            "lobby": "Lobby ({{count}})",
            "participantsList": "Anwesende ({{count}})",
-            "visitors": "Gäste ({{count}})",
            "waitingLobby": "In der Lobby ({{count}})"
        },
        "search": "Suche Anwesende",
@ -780,7 +758,6 @@
    },
    "passwordDigitsOnly": "Bis zu {{number}} Ziffern",
    "passwordSetRemotely": "von einer anderen Person gesetzt",
-    "pinParticipant": "{{participantName}} - anheften",
    "pinnedParticipant": "Die Person ist angeheftet",
    "polls": {
        "answer": {
@ -939,7 +916,6 @@
        "localRecordingVideoWarning": "Um Ihr eigenes Kamerabild aufzuzeichnen, müssen Sie Ihre Kamera beim Start der Aufnahme einschalten",
        "localRecordingWarning": "Bitte prüfen Sie, dass das aktuelle Tab auswählen, um Bild und Ton aufzuzeichnen. Die Länge der Aufzeichnung ist aktuell auf 1GB beschränkt, was ungefähr 100 Minuten entspricht.",
        "loggedIn": "Als {{userName}} angemeldet",
-        "noMicPermission": "Zugriff auf Mikrofon fehlgeschlagen. Bitte erlauben Sie den Zugriff auf das Mikrofon.",
        "noStreams": "Kein Ton oder Video erkannt.",
        "off": "Aufnahme gestoppt",
        "offBy": "{{name}} stoppte die Aufnahme",
@ -973,7 +949,6 @@
        "title": "Sicherheitsoptionen"
    },
    "settings": {
-        "audio": "Audio",
        "buttonLabel": "Einstellungen",
        "calendar": {
            "about": "Die Kalenderintegration von {{appName}} wird verwendet, um ein sicheres Zugreifen auf Ihren Kalender und Auslesen der bevorstehenden Termine zu ermöglichen.",
@ -994,11 +969,9 @@
        "maxStageParticipants": "Maximale Anzahl an Personen, die zur Hauptansicht angeheftet werden können",
        "microphones": "Mikrofon",
        "moderator": "Moderation",
-        "moderatorOptions": "Moderationseinstellungen",
        "more": "Mehr",
        "name": "Name",
        "noDevice": "Kein",
-        "notifications": "Benachrichtigungen",
        "participantJoined": "Neue Person nimmt teil",
        "participantKnocking": "Person hat Lobby betreten",
        "participantLeft": "Person verlässt die Konferenz",
@ -1009,14 +982,13 @@
        "selectCamera": "Kamera",
        "selectMic": "Mikrofon",
        "selfView": "Eigene Ansicht",
-        "shortcuts": "Tastaturkürzel",
+        "sounds": "Hinweistöne",
        "speakers": "Lautsprecher",
        "startAudioMuted": "Alle Personen treten stummgeschaltet bei",
        "startReactionsMuted": "Interaktionstöne für alle deaktivieren",
        "startVideoMuted": "Alle Personen treten ohne Video bei",
        "talkWhileMuted": "Wenn bei Stummschaltung gesprochen wird",
-        "title": "Einstellungen",
-        "video": "Kamera"
+        "title": "Einstellungen"
    },
    "settingsView": {
        "advanced": "Erweitert",
@ -1108,7 +1080,6 @@
            "giphy": "GIPHY ein-/ausschalten",
            "grantModerator": "Moderationsrechte vergeben",
            "hangup": "Konferenz verlassen",
-            "heading": "Toolbar",
            "help": "Hilfe",
            "invite": "Person einladen",
            "kick": "Person entfernen",
@ -1175,7 +1146,6 @@
        "download": "Unsere Apps herunterladen",
        "e2ee": "Ende-zu-Ende-Verschlüsselung",
        "embedMeeting": "Konferenz einbetten",
-        "enableNoiseSuppression": "Rauschunterdrückung einschalten",
        "endConference": "Konferenz für alle beenden",
        "enterFullScreen": "Vollbildmodus",
        "enterTileView": "Kachelansicht einschalten",
@ -1263,7 +1233,6 @@
        "subtitlesOff": "Ausschalten",
        "tr": "TR"
    },
-    "unpinParticipant": "{{participantName}} - Nicht mehr anheften",
    "userMedia": {
        "androidGrantPermissions": "Wählen Sie <b><i>Zulassen</i></b>, wenn der Browser um Berechtigungen bittet.",
        "chromeGrantPermissions": "Wählen Sie <b><i>Zulassen</i></b>, wenn der Browser um Berechtigungen bittet.",
@ -1302,11 +1271,9 @@
        "ldTooltip": "Video wird in niedriger Auflösung angezeigt",
        "lowDefinition": "Niedrige Auflösung",
        "performanceSettings": "Qualitätseinstellungen",
-        "recording": "Aufnahme läuft",
        "sd": "SD",
        "sdTooltip": "Video wird in Standardauflösung angezeigt",
-        "standardDefinition": "Standardauflösung",
-        "streaming": "Streaming läuft"
+        "standardDefinition": "Standardauflösung"
    },
    "videothumbnail": {
        "connectionInfo": "Verbindungsinformationen",
@ -1318,7 +1285,6 @@
        "grantModerator": "Moderationsrechte vergeben",
        "hideSelfView": "Eigene Ansicht ausblenden",
        "kick": "Hinauswerfen",
-        "mirrorVideo": "Mein Video spiegeln",
        "moderator": "Moderation",
        "mute": "Person ist stumm geschaltet",
        "muted": "Stummgeschaltet",
@ -1356,7 +1322,6 @@
        "webAssemblyWarning": "WebAssembly wird nicht unterstützt",
        "webAssemblyWarningDescription": "WebAssembly ist deaktiviert oder wird in diesem Browser nicht unterstützt"
    },
-    "visitorsLabel": "Anzahl Gäste: {{count}}",
    "volumeSlider": "Lautstärkeregler",
    "welcomepage": {
        "accessibilityLabel": {
@ -1389,7 +1354,6 @@
            "microsoftLogo": "Microsoft Logo",
            "policyLogo": "Richtlinienlogo"
        },
-        "meetingsAccessibilityLabel": "Konferenzen",
        "mobileDownLoadLinkAndroid": "Android App Download",
        "mobileDownLoadLinkFDroid": "F-Droid App Download",
        "mobileDownLoadLinkIos": "iOS App Download",
@ -1409,10 +1373,5 @@
        "terms": "AGB",
        "title": "Sichere, voll funktionale und komplett kostenlose Videokonferenzen",
        "upcomingMeetings": "Ihre zukünftigen Konferenzen"
-    },
-    "whiteboard": {
-        "accessibilityLabel": {
-            "heading": "Whiteboard"
-        }
    }
 }
--- a/lang/main-dsb.json
+++ b/lang/main-dsb.json
--- a/lang/main-es.json
+++ b/lang/main-es.json
@ -838,7 +838,7 @@
        "selectCamera": "Cámara",
        "selectMic": "Micrófono",
        "sounds": "Sonidos",
-        "speakers": "Altavoces",
+        "speakers": "Parlantes",
        "startAudioMuted": "Todos inician silenciados",
        "startVideoMuted": "Todos inician con cámara desactivada",
        "talkWhileMuted": "Hablar en silencio",
--- a/lang/main.json
+++ b/lang/main.json
@ -184,21 +184,13 @@
    "deepLinking": {
        "appNotInstalled": "You need the {{app}} mobile app to join this meeting on your phone.",
        "description": "Nothing happened? We tried launching your meeting in the {{app}} desktop app. Try again or launch it in the {{app}} web app.",
-        "descriptionNew": "Nothing happened? We tried launching your meeting in the {{app}} desktop app. <br /><br /> You can try again or launch it on web.",
        "descriptionWithoutWeb": "Nothing happened? We tried launching your meeting in the {{app}} desktop app.",
        "downloadApp": "Download the app",
-        "downloadMobileApp": "Download from App Store",
        "ifDoNotHaveApp": "If you don't have the app yet:",
        "ifHaveApp": "If you already have the app:",
        "joinInApp": "Join this meeting using the app",
-        "joinInAppNew": "Join in app",
-        "joinInBrowser": "Join in browser",
-        "launchMeetingLabel": "How do you want to join this meeting?",
        "launchWebButton": "Launch in web",
-        "noMobileApp": "You don’t have the app?",
-        "termsAndConditions": "By continuing you agree to our <a href='{{termsAndConditionsLink}}' rel='noopener noreferrer' target='_blank'>terms & conditions.</a>",
        "title": "Launching your meeting in {{app}}...",
-        "titleNew": "Launching your meeting ...",
        "tryAgainButton": "Try again in desktop",
        "unsupportedBrowser": "It looks like you're using a browser we don't support."
    },
@ -211,16 +203,10 @@
        "microphonePermission": "Error obtaining microphone permission"
    },
    "deviceSelection": {
-        "hid": {
-            "callControl": "Call control",
-            "connectedDevices": "Connected devices:",
-            "deleteDevice": "Delete device",
-            "pairDevice": "Pair device"
-        },
        "noPermission": "Permission not granted",
        "previewUnavailable": "Preview unavailable",
        "selectADevice": "Select a device",
-        "testAudio": "Test"
+        "testAudio": "Play a test sound"
    },
    "dialIn": {
        "screenTitle": "Dial-in summary"
@ -240,9 +226,7 @@
        "WaitingForHostTitle": "Waiting for the host ...",
        "Yes": "Yes",
        "accessibilityLabel": {
-            "close": "Close dialog",
-            "liveStreaming": "Live Stream",
-            "sharingTabs": "Sharing options"
+            "liveStreaming": "Live Stream"
        },
        "add": "Add",
        "addMeetingNote": "Add a note about this meeting",
@ -454,11 +438,6 @@
        "veryBad": "Very Bad",
        "veryGood": "Very Good"
    },
-    "filmstrip": {
-        "accessibilityLabel": {
-            "heading": "Video thumbnails"
-        }
-    },
    "giphy": {
        "noResults": "No results found :(",
        "search": "Search GIPHY"
@ -772,7 +751,6 @@
        "headings": {
            "lobby": "Lobby ({{count}})",
            "participantsList": "Meeting participants ({{count}})",
-            "visitors": "Visitors ({{count}})",
            "waitingLobby": "Waiting in lobby ({{count}})"
        },
        "search": "Search participants",
@ -780,7 +758,6 @@
    },
    "passwordDigitsOnly": "Up to {{number}} digits",
    "passwordSetRemotely": "Set by another participant",
-    "pinParticipant": "{{participantName}} - Pin",
    "pinnedParticipant": "The participant is pinned",
    "polls": {
        "answer": {
@ -888,9 +865,9 @@
    },
    "profile": {
        "avatar": "avatar",
-        "setDisplayNameLabel": "Name",
+        "setDisplayNameLabel": "Set your display name",
        "setEmailInput": "Enter email",
-        "setEmailLabel": "Gravatar email",
+        "setEmailLabel": "Set your gravatar email",
        "title": "Profile"
    },
    "raisedHand": "Would like to speak",
@ -973,7 +950,6 @@
        "title": "Security Options"
    },
    "settings": {
-        "audio": "Audio",
        "buttonLabel": "Settings",
        "calendar": {
            "about": "The {{appName}} calendar integration is used to securely access your calendar so it can read upcoming events.",
@ -994,11 +970,9 @@
        "maxStageParticipants": "Maximum number of participants who can be pinned to the main stage (EXPERIMENTAL)",
        "microphones": "Microphones",
        "moderator": "Moderator",
-        "moderatorOptions": "Moderator options",
-        "more": "General",
+        "more": "More",
        "name": "Name",
        "noDevice": "None",
-        "notifications": "Notifications",
        "participantJoined": "Participant Joined",
        "participantKnocking": "Participant entered lobby",
        "participantLeft": "Participant Left",
@ -1009,14 +983,13 @@
        "selectCamera": "Camera",
        "selectMic": "Microphone",
        "selfView": "Self view",
-        "shortcuts": "Shortcuts",
+        "sounds": "Sounds",
        "speakers": "Speakers",
        "startAudioMuted": "Everyone starts muted",
        "startReactionsMuted": "Mute reaction sounds for everyone",
        "startVideoMuted": "Everyone starts hidden",
        "talkWhileMuted": "Talk while muted",
-        "title": "Settings",
-        "video": "Video"
+        "title": "Settings"
    },
    "settingsView": {
        "advanced": "Advanced",
@ -1108,7 +1081,6 @@
            "giphy": "Toggle GIPHY menu",
            "grantModerator": "Grant Moderator Rights",
            "hangup": "Leave the meeting",
-            "heading": "Toolbar",
            "help": "Help",
            "invite": "Invite people",
            "kick": "Kick participant",
@ -1175,7 +1147,6 @@
        "download": "Download our apps",
        "e2ee": "End-to-End Encryption",
        "embedMeeting": "Embed meeting",
-        "enableNoiseSuppression": "Enable noise suppression",
        "endConference": "End meeting for all",
        "enterFullScreen": "View full screen",
        "enterTileView": "Enter tile view",
@ -1263,7 +1234,6 @@
        "subtitlesOff": "Off",
        "tr": "TR"
    },
-    "unpinParticipant": "{{participantName}} - Unpin",
    "userMedia": {
        "androidGrantPermissions": "Select <b><i>Allow</i></b> when your browser asks for permissions.",
        "chromeGrantPermissions": "Select <b><i>Allow</i></b> when your browser asks for permissions.",
@ -1302,11 +1272,9 @@
        "ldTooltip": "Viewing low definition video",
        "lowDefinition": "Low definition",
        "performanceSettings": "Performance settings",
-        "recording": "Recording in progress",
        "sd": "SD",
        "sdTooltip": "Viewing standard definition video",
-        "standardDefinition": "Standard definition",
-        "streaming": "Streaming in progress"
+        "standardDefinition": "Standard definition"
    },
    "videothumbnail": {
        "connectionInfo": "Connection Info",
@ -1318,7 +1286,6 @@
        "grantModerator": "Grant Moderator Rights",
        "hideSelfView": "Hide self view",
        "kick": "Kick out",
-        "mirrorVideo": "Mirror my video",
        "moderator": "Moderator",
        "mute": "Participant is muted",
        "muted": "Muted",
@ -1350,13 +1317,12 @@
        "none": "None",
        "pleaseWait": "Please wait...",
        "removeBackground": "Remove background",
-        "slightBlur": "Half Blur",
+        "slightBlur": "Slight Blur",
        "title": "Virtual backgrounds",
        "uploadedImage": "Uploaded image {{index}}",
        "webAssemblyWarning": "WebAssembly not supported",
        "webAssemblyWarningDescription": "WebAssembly disabled or not supported by this browser"
    },
-    "visitorsLabel": "Number of visitors: {{count}}",
    "volumeSlider": "Volume slider",
    "welcomepage": {
        "accessibilityLabel": {
@ -1389,7 +1355,6 @@
            "microsoftLogo": "Microsoft logo",
            "policyLogo": "Policy logo"
        },
-        "meetingsAccessibilityLabel": "Meetings",
        "mobileDownLoadLinkAndroid": "Download mobile app for Android",
        "mobileDownLoadLinkFDroid": "Download mobile app for F-Droid",
        "mobileDownLoadLinkIos": "Download mobile app for iOS",
@ -1409,10 +1374,5 @@
        "terms": "Terms",
        "title": "Secure, fully featured, and completely free video conferencing",
        "upcomingMeetings": "Your upcoming meetings"
-    },
-    "whiteboard": {
-        "accessibilityLabel": {
-            "heading": "Whiteboard"
-        }
    }
 }
--- a/modules/API/API.js
+++ b/modules/API/API.js
@ -71,13 +71,8 @@ import {
 import { appendSuffix } from '../../react/features/display-name';
 import { isEnabled as isDropboxEnabled } from '../../react/features/dropbox';
 import { setMediaEncryptionKey, toggleE2EE } from '../../react/features/e2ee/actions';
-import {
-    addStageParticipant,
-    resizeFilmStrip,
-    setVolume,
-    togglePinStageParticipant
-} from '../../react/features/filmstrip/actions.web';
-import { getPinnedActiveParticipants, isStageFilmstripAvailable } from '../../react/features/filmstrip/functions.web';
+import { addStageParticipant, resizeFilmStrip, setVolume } from '../../react/features/filmstrip/actions.web';
+import { isStageFilmstripAvailable } from '../../react/features/filmstrip/functions.web';
 import { invite } from '../../react/features/invite';
 import {
    selectParticipantInLargeVideo
@ -106,8 +101,6 @@ import { startAudioScreenShareFlow, startScreenShareFlow } from '../../react/fea
 import { isScreenAudioSupported } from '../../react/features/screen-share/functions';
 import { toggleScreenshotCaptureSummary } from '../../react/features/screenshot-capture';
 import { isScreenshotCaptureEnabled } from '../../react/features/screenshot-capture/functions';
-import SettingsDialog from '../../react/features/settings/components/web/SettingsDialog';
-import { SETTINGS_TABS } from '../../react/features/settings/constants';
 import { playSharedVideo, stopSharedVideo } from '../../react/features/shared-video/actions.any';
 import { extractYoutubeIdOrURL } from '../../react/features/shared-video/functions';
 import { setRequestingSubtitles, toggleRequestingSubtitles } from '../../react/features/subtitles/actions';
@ -115,6 +108,7 @@ import { isAudioMuteButtonDisabled } from '../../react/features/toolbox/function
 import { setTileView, toggleTileView } from '../../react/features/video-layout';
 import { muteAllParticipants } from '../../react/features/video-menu/actions';
 import { setVideoQuality } from '../../react/features/video-quality';
+import VirtualBackgroundDialog from '../../react/features/virtual-background/components/VirtualBackgroundDialog';
 import { getJitsiMeetTransport } from '../transport';

 import { API_ID, ENDPOINT_TEXT_MESSAGE_NAME } from './constants';
@ -247,22 +241,6 @@ function initCommands() {
            logger.debug('Pin participant command received');

            const state = APP.store.getState();
-
-            // if id not provided, unpin everybody.
-            if (!id) {
-                if (isStageFilmstripAvailable(state)) {
-                    const pinnedParticipants = getPinnedActiveParticipants(state);
-
-                    pinnedParticipants?.forEach(p => {
-                        APP.store.dispatch(togglePinStageParticipant(p.participantId));
-                    });
-                } else {
-                    APP.store.dispatch(pinParticipant());
-                }
-
-                return;
-            }
-
            const participant = videoType === VIDEO_TYPE.DESKTOP
                ? getVirtualScreenshareParticipantByOwnerId(state, id) : getParticipantById(state, id);

@ -276,7 +254,7 @@ function initCommands() {

            const participantId = participant.id;

-            if (isStageFilmstripAvailable(state)) {
+            if (isStageFilmstripAvailable(APP.store.getState())) {
                APP.store.dispatch(addStageParticipant(participantId, true));
            } else {
                APP.store.dispatch(pinParticipant(participantId));
@ -799,8 +777,7 @@ function initCommands() {
            APP.store.dispatch(overwriteConfig(whitelistedConfig));
        },
        'toggle-virtual-background': () => {
-            APP.store.dispatch(toggleDialog(SettingsDialog, {
-                defaultTab: SETTINGS_TABS.VIRTUAL_BACKGROUND }));
+            APP.store.dispatch(toggleDialog(VirtualBackgroundDialog));
        },
        'end-conference': () => {
            APP.store.dispatch(endConference());
@ -1231,22 +1208,6 @@ class API {
        });
    }

-    /**
-     * Notify the external app that a notification has been triggered.
-     *
-     * @param {string} title - The notification title.
-     * @param {string} description - The notification description.
-     *
-     * @returns {void}
-     */
-    notifyNotificationTriggered(title: string, description: string) {
-        this._sendEvent({
-            description,
-            name: 'notification-triggered',
-            title
-        });
-    }
-
    /**
     * Notify external application that the video quality setting has changed.
     *
--- a/modules/API/external/external_api.js
+++ b/modules/API/external/external_api.js
@ -127,7 +127,6 @@ const events = {
    'mouse-enter': 'mouseEnter',
    'mouse-leave': 'mouseLeave',
    'mouse-move': 'mouseMove',
-    'notification-triggered': 'notificationTriggered',
    'outgoing-message': 'outgoingMessage',
    'participant-joined': 'participantJoined',
    'participant-kicked-out': 'participantKickedOut',
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@ -292,6 +292,17 @@ UI.showToolbar = timeout => APP.store.dispatch(showToolbox(timeout));
 // Used by torture.
 UI.dockToolbar = dock => APP.store.dispatch(dockToolbox(dock));

+/**
+ * Updates the displayed avatar for participant.
+ *
+ * @param {string} id - User id whose avatar should be updated.
+ * @param {string} avatarURL - The URL to avatar image to display.
+ * @returns {void}
+ */
+UI.refreshAvatarDisplay = function(id) {
+    VideoLayout.changeUserAvatar(id);
+};
+
 /**
 * Notify user that connection failed.
 * @param {string} stropheErrorMsg raw Strophe error message
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@ -139,6 +139,12 @@ const VideoLayout = {
        }
    },

+    changeUserAvatar(id, avatarUrl) {
+        if (this.isCurrentlyOnLarge(id)) {
+            largeVideo.updateAvatar(avatarUrl);
+        }
+    },
+
    isLargeVideoVisible() {
        return this.isLargeContainerTypeVisible(VIDEO_CONTAINER_TYPE);
    },
--- a/modules/keyboardshortcut/keyboardshortcut.js
+++ b/modules/keyboardshortcut/keyboardshortcut.js
@ -8,9 +8,10 @@ import {
    createShortcutEvent,
    sendAnalytics
 } from '../../react/features/analytics';
+import { toggleDialog } from '../../react/features/base/dialog';
 import { clickOnVideo } from '../../react/features/filmstrip/actions';
-import { openSettingsDialog } from '../../react/features/settings/actions';
-import { SETTINGS_TABS } from '../../react/features/settings/constants';
+import { KeyboardShortcutsDialog }
+    from '../../react/features/keyboard-shortcuts';

 const logger = Logger.getLogger(__filename);

@ -119,17 +120,15 @@ const KeyboardShortcut = {
        return jitsiLocalStorage.getItem(_enableShortcutsKey) === 'false' ? false : true;
    },

-    getShortcutsDescriptions() {
-        return _shortcutsHelp;
-    },
-
    /**
-     * Opens the {@SettingsDialog} dialog on the  Shortcuts page.
+     * Opens the {@KeyboardShortcutsDialog} dialog.
     *
     * @returns {void}
     */
    openDialog() {
-        APP.store.dispatch(openSettingsDialog(SETTINGS_TABS.SHORTCUTS, false));
+        APP.store.dispatch(toggleDialog(KeyboardShortcutsDialog, {
+            shortcutDescriptions: _shortcutsHelp
+        }));
    },

    /**
--- a/package-lock.json
+++ b/package-lock.json
@ -15,8 +15,10 @@
        "@atlaskit/icon": "21.2.0",
        "@atlaskit/inline-dialog": "13.0.9",
        "@atlaskit/inline-message": "11.0.8",
+        "@atlaskit/modal-dialog": "11.2.4",
        "@atlaskit/multi-select": "15.0.5",
        "@atlaskit/spinner": "15.0.6",
+        "@atlaskit/tabs": "12.1.2",
        "@atlaskit/theme": "11.0.2",
        "@atlaskit/tooltip": "17.1.2",
        "@emotion/react": "11.10.0",
@ -50,7 +52,6 @@
        "@types/amplitude-js": "8.16.2",
        "@types/audioworklet": "0.0.29",
        "@types/w3c-image-capture": "1.0.6",
-        "@types/w3c-web-hid": "1.0.3",
        "@vladmandic/human": "2.6.5",
        "@vladmandic/human-models": "2.5.9",
        "@xmldom/xmldom": "0.7.9",
@ -72,7 +73,7 @@
        "js-md5": "0.6.1",
        "js-sha512": "0.8.0",
        "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1589.0.0+d43c349d/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1578.0.0+5855ca72/lib-jitsi-meet.tgz",
        "lodash": "4.17.21",
        "moment": "2.29.4",
        "moment-duration-format": "2.2.2",
@ -111,7 +112,7 @@
        "react-native-url-polyfill": "1.3.0",
        "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
        "react-native-watch-connectivity": "1.0.11",
-        "react-native-webrtc": "106.0.6",
+        "react-native-webrtc": "106.0.5",
        "react-native-webview": "11.15.1",
        "react-native-youtube-iframe": "2.2.1",
        "react-redux": "7.1.0",
@ -139,6 +140,7 @@
        "@babel/preset-env": "7.16.0",
        "@babel/preset-flow": "7.16.0",
        "@babel/preset-react": "7.16.0",
+        "@babel/runtime": "7.16.0",
        "@jitsi/eslint-config": "4.1.5",
        "@types/js-md5": "0.4.3",
        "@types/lodash": "4.14.182",
@ -158,18 +160,20 @@
        "circular-dependency-plugin": "5.2.0",
        "clean-css-cli": "4.3.0",
        "css-loader": "3.6.0",
-        "eslint": "8.35.0",
+        "eslint": "8.25.0",
        "eslint-plugin-flowtype": "8.0.3",
        "eslint-plugin-import": "2.25.2",
        "eslint-plugin-jsdoc": "37.0.3",
        "eslint-plugin-react": "7.26.1",
        "eslint-plugin-react-native": "3.11.0",
        "eslint-plugin-typescript-sort-keys": "2.1.0",
+        "imports-loader": "0.7.1",
        "jetifier": "1.6.4",
        "metro-react-native-babel-preset": "0.67.0",
        "patch-package": "6.4.7",
        "process": "0.11.10",
        "sass": "1.26.8",
+        "string-replace-loader": "3.0.3",
        "style-loader": "3.3.1",
        "traverse": "0.6.6",
        "ts-loader": "9.4.1",
@ -332,6 +336,44 @@
        "react": "^16.8.0"
      }
    },
+    "node_modules/@atlaskit/blanket": {
+      "version": "11.4.1",
+      "resolved": "https://registry.npmjs.org/@atlaskit/blanket/-/blanket-11.4.1.tgz",
+      "integrity": "sha512-jQor3MUcsD04/lUjdW89daYw6t0gFEuWzyqYGKgDQpVeQ3n0Lfrg5S3Eogc2cbRzgKMGaET6HMB+FD6EpE2QsQ==",
+      "dependencies": {
+        "@atlaskit/analytics-next": "^8.0.0",
+        "@atlaskit/ds-lib": "^1.2.0",
+        "@atlaskit/theme": "^11.2.0",
+        "@babel/runtime": "^7.0.0",
+        "@emotion/core": "^10.0.9"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0"
+      }
+    },
+    "node_modules/@atlaskit/blanket/node_modules/@atlaskit/theme": {
+      "version": "11.5.2",
+      "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-11.5.2.tgz",
+      "integrity": "sha512-iycVcMzGaPboTVu0s+DoeV3oZZGIxXca1IjVtlxERA/78dftYoVTjiBnh6XtAQnIgB0O+SaAOQaaHJZgJ4gwpQ==",
+      "dependencies": {
+        "@atlaskit/tokens": "^0.2.0",
+        "@babel/runtime": "^7.0.0",
+        "exenv": "^1.2.2",
+        "prop-types": "^15.5.10"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0",
+        "styled-components": "^3.2.6"
+      }
+    },
+    "node_modules/@atlaskit/blanket/node_modules/@atlaskit/tokens": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@atlaskit/tokens/-/tokens-0.2.1.tgz",
+      "integrity": "sha512-Fm/F9mOC7QI5OSwvyY5N5+cvhx0lPLPAE5sE520ztb+YOaSiFxHZ13YBJkkdVTtxbGsYayYWITinGDQcCnhLog==",
+      "dependencies": {
+        "@babel/runtime": "^7.0.0"
+      }
+    },
    "node_modules/@atlaskit/button": {
      "version": "15.1.4",
      "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-15.1.4.tgz",
@ -621,6 +663,93 @@
        "styled-components": "^3.2.6"
      }
    },
+    "node_modules/@atlaskit/modal-dialog": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/@atlaskit/modal-dialog/-/modal-dialog-11.2.4.tgz",
+      "integrity": "sha512-+Qe2Ai2qiBCaLm5F144Kn+M8931097mlZTbBppCrhBbanOyZJHrRkzqbCCd5NGGLpfLUZxfZaQYJssrHfGCDnA==",
+      "dependencies": {
+        "@atlaskit/analytics-next": "^8.0.0",
+        "@atlaskit/blanket": "^11.0.0",
+        "@atlaskit/button": "^15.1.0",
+        "@atlaskit/icon": "^21.1.0",
+        "@atlaskit/portal": "^4.0.0",
+        "@atlaskit/theme": "^11.0.0",
+        "@babel/runtime": "^7.0.0",
+        "@emotion/core": "^10.0.9",
+        "@emotion/styled": "^10.0.7",
+        "exenv": "^1.2.2",
+        "raf-schd": "^2.1.0",
+        "react-focus-lock": "^1.19.1",
+        "react-scrolllock": "^5.0.1",
+        "react-transition-group": "^4.4.1",
+        "react-uid": "^2.2.0",
+        "tiny-invariant": "^0.0.3"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0"
+      }
+    },
+    "node_modules/@atlaskit/modal-dialog/node_modules/@emotion/styled": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.3.0.tgz",
+      "integrity": "sha512-GgcUpXBBEU5ido+/p/mCT2/Xx+Oqmp9JzQRuC+a4lYM4i4LBBn/dWvc0rQ19N9ObA8/T4NWMrPNe79kMBDJqoQ==",
+      "dependencies": {
+        "@emotion/styled-base": "^10.3.0",
+        "babel-plugin-emotion": "^10.0.27"
+      },
+      "peerDependencies": {
+        "@emotion/core": "^10.0.27",
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/@atlaskit/modal-dialog/node_modules/dom-helpers": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "dependencies": {
+        "@babel/runtime": "^7.8.7",
+        "csstype": "^3.0.2"
+      }
+    },
+    "node_modules/@atlaskit/modal-dialog/node_modules/focus-lock": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.8.tgz",
+      "integrity": "sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og=="
+    },
+    "node_modules/@atlaskit/modal-dialog/node_modules/raf-schd": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-2.1.2.tgz",
+      "integrity": "sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g=="
+    },
+    "node_modules/@atlaskit/modal-dialog/node_modules/react-focus-lock": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-1.19.1.tgz",
+      "integrity": "sha512-TPpfiack1/nF4uttySfpxPk4rGZTLXlaZl7ncZg/ELAk24Iq2B1UUaUioID8H8dneUXqznT83JTNDHDj+kwryw==",
+      "dependencies": {
+        "@babel/runtime": "^7.0.0",
+        "focus-lock": "^0.6.3",
+        "prop-types": "^15.6.2",
+        "react-clientside-effect": "^1.2.0"
+      },
+      "peerDependencies": {
+        "react": "^15.0.0 || ^16.0.0"
+      }
+    },
+    "node_modules/@atlaskit/modal-dialog/node_modules/react-transition-group": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
+      "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "dom-helpers": "^5.0.1",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.6.0",
+        "react-dom": ">=16.6.0"
+      }
+    },
    "node_modules/@atlaskit/motion": {
      "version": "0.4.8",
      "resolved": "https://registry.npmjs.org/@atlaskit/motion/-/motion-0.4.8.tgz",
@ -716,6 +845,20 @@
        "react": "^16.8.0"
      }
    },
+    "node_modules/@atlaskit/tabs": {
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/@atlaskit/tabs/-/tabs-12.1.2.tgz",
+      "integrity": "sha512-/PbNIwXh0YMoo8pUjLwJfZEe+vtHENhBWuQc1pK4rW7JNBAD0VYrAJ+JLiZ+ZWGFCOoCSneoJguDBH0I2FMrqA==",
+      "dependencies": {
+        "@atlaskit/analytics-next": "^8.0.0",
+        "@atlaskit/theme": "^11.0.0",
+        "@babel/runtime": "^7.0.0",
+        "@emotion/core": "^10.0.9"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0"
+      }
+    },
    "node_modules/@atlaskit/tag": {
      "version": "11.2.5",
      "resolved": "https://registry.npmjs.org/@atlaskit/tag/-/tag-11.2.5.tgz",
@ -3250,15 +3393,15 @@
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
-      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
      "dev": true,
      "dependencies": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
        "espree": "^9.4.0",
-        "globals": "^13.19.0",
+        "globals": "^13.15.0",
        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
        "js-yaml": "^4.1.0",
@ -3279,9 +3422,9 @@
      "dev": true
    },
    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
      "dev": true,
      "dependencies": {
        "type-fest": "^0.20.2"
@ -3333,15 +3476,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/@eslint/js": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
-      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
    "node_modules/@giphy/js-analytics": {
      "version": "4.0.7",
      "resolved": "https://registry.npmjs.org/@giphy/js-analytics/-/js-analytics-4.0.7.tgz",
@ -3479,14 +3613,14 @@
      }
    },
    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
+      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
      "dev": true,
      "dependencies": {
        "@humanwhocodes/object-schema": "^1.2.1",
        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
+        "minimatch": "^3.0.4"
      },
      "engines": {
        "node": ">=10.10.0"
@ -6516,11 +6650,6 @@
        "@types/webrtc": "*"
      }
    },
-    "node_modules/@types/w3c-web-hid": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/w3c-web-hid/-/w3c-web-hid-1.0.3.tgz",
-      "integrity": "sha512-eTQRkPd2JukZfS9+kRtrBAaTCCb6waGh5X8BJHmH1MiVQPLMYwm4+EvhwFfOo9SDna15o9dFAwmWwN6r/YM53A=="
-    },
    "node_modules/@types/webgl-ext": {
      "version": "0.0.30",
      "resolved": "https://registry.npmjs.org/@types/webgl-ext/-/webgl-ext-0.0.30.tgz",
@ -9894,16 +10023,14 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
-      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
+      "version": "8.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
+      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
      "dev": true,
      "dependencies": {
-        "@eslint/eslintrc": "^2.0.0",
-        "@eslint/js": "8.35.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.10.5",
        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
        "ajv": "^6.10.0",
        "chalk": "^4.0.0",
        "cross-spawn": "^7.0.2",
@ -9914,19 +10041,19 @@
        "eslint-utils": "^3.0.0",
        "eslint-visitor-keys": "^3.3.0",
        "espree": "^9.4.0",
-        "esquery": "^1.4.2",
+        "esquery": "^1.4.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
        "file-entry-cache": "^6.0.1",
        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
        "grapheme-splitter": "^1.0.4",
        "ignore": "^5.2.0",
        "import-fresh": "^3.0.0",
        "imurmurhash": "^0.1.4",
        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
        "js-sdsl": "^4.1.4",
        "js-yaml": "^4.1.0",
        "json-stable-stringify-without-jsonify": "^1.0.1",
@ -10335,9 +10462,9 @@
      }
    },
    "node_modules/eslint/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
      "dev": true,
      "dependencies": {
        "type-fest": "^0.20.2"
@ -10465,9 +10592,9 @@
      }
    },
    "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
      "dev": true,
      "dependencies": {
        "acorn": "^8.8.0",
@ -10503,9 +10630,9 @@
      }
    },
    "node_modules/esquery": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz",
-      "integrity": "sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
      "dev": true,
      "dependencies": {
        "estraverse": "^5.1.0"
@ -11961,6 +12088,16 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/imports-loader": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz",
+      "integrity": "sha1-8gS180cCoywdt9SNidXoZ6BEElM=",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.0.2",
+        "source-map": "^0.5.6"
+      }
+    },
    "node_modules/imurmurhash": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@ -13416,8 +13553,8 @@
    },
    "node_modules/lib-jitsi-meet": {
      "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1589.0.0+d43c349d/lib-jitsi-meet.tgz",
-      "integrity": "sha512-6QuR109o4sq24c9EU73NGLWAdJO+piiEylsqtmOL/B+I2GMTFeIras0tMOl6eQpncpZS5nD9gqiJmTNDnZqWbw==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1578.0.0+5855ca72/lib-jitsi-meet.tgz",
+      "integrity": "sha512-AAEClrQNOVHNO1lKr/F1SOyiduZfI6bql3eiIxC3LZ5cBcyoRVmwI6uiAbLail0VkuKnTecEWcfYZ9lvokxrMw==",
      "license": "Apache-2.0",
      "dependencies": {
        "@jitsi/js-utils": "2.0.0",
@ -16408,9 +16545,9 @@
      }
    },
    "node_modules/react-native-webrtc": {
-      "version": "106.0.6",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-106.0.6.tgz",
-      "integrity": "sha512-mxRqR/sNZfVnbTM8cd90Y+A23H53jvZ/j0W7MSSFAbsQrj9Jdew1+7tJVTcBieF1S4ytTLI/R95scOQ4+qeE2Q==",
+      "version": "106.0.5",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-106.0.5.tgz",
+      "integrity": "sha512-EINzYpTZh6zXb2lcGH13Ieli1ur3M1FaT8R8WMqfUZEW8/y0WV6yBeQQVz55OA4LtWnBUX0RZyaYQ4aZN4e1Sw==",
      "hasInstallScript": true,
      "dependencies": {
        "adm-zip": "0.5.9",
@ -18070,6 +18207,51 @@
      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
      "dev": true
    },
+    "node_modules/string-replace-loader": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-3.0.3.tgz",
+      "integrity": "sha512-8c26Dl6H9XmKNj3mFBvaUYR7ImOxQ4YRBFuUju78wXpa1cDpyDYvKmqGg8mfkxdYexQ/BBogB7PELlLnmR08nw==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5"
+      }
+    },
+    "node_modules/string-replace-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/string-replace-loader/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
    "node_modules/string-replace-to-array": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/string-replace-to-array/-/string-replace-to-array-1.0.3.tgz",
@ -18605,6 +18787,11 @@
      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
      "dev": true
    },
+    "node_modules/tiny-invariant": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-0.0.3.tgz",
+      "integrity": "sha512-SA2YwvDrCITM9fTvHTHRpq9W6L2fBsClbqm3maT5PZux4Z73SPPDYwJMtnoWh6WMgmCkJij/LaOlWiqJqFMK8g=="
+    },
    "node_modules/tiny-warning": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
@ -20542,6 +20729,39 @@
        "tslib": "^2.0.0"
      }
    },
+    "@atlaskit/blanket": {
+      "version": "11.4.1",
+      "resolved": "https://registry.npmjs.org/@atlaskit/blanket/-/blanket-11.4.1.tgz",
+      "integrity": "sha512-jQor3MUcsD04/lUjdW89daYw6t0gFEuWzyqYGKgDQpVeQ3n0Lfrg5S3Eogc2cbRzgKMGaET6HMB+FD6EpE2QsQ==",
+      "requires": {
+        "@atlaskit/analytics-next": "^8.0.0",
+        "@atlaskit/ds-lib": "^1.2.0",
+        "@atlaskit/theme": "^11.2.0",
+        "@babel/runtime": "^7.0.0",
+        "@emotion/core": "^10.0.9"
+      },
+      "dependencies": {
+        "@atlaskit/theme": {
+          "version": "11.5.2",
+          "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-11.5.2.tgz",
+          "integrity": "sha512-iycVcMzGaPboTVu0s+DoeV3oZZGIxXca1IjVtlxERA/78dftYoVTjiBnh6XtAQnIgB0O+SaAOQaaHJZgJ4gwpQ==",
+          "requires": {
+            "@atlaskit/tokens": "^0.2.0",
+            "@babel/runtime": "^7.0.0",
+            "exenv": "^1.2.2",
+            "prop-types": "^15.5.10"
+          }
+        },
+        "@atlaskit/tokens": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/@atlaskit/tokens/-/tokens-0.2.1.tgz",
+          "integrity": "sha512-Fm/F9mOC7QI5OSwvyY5N5+cvhx0lPLPAE5sE520ztb+YOaSiFxHZ13YBJkkdVTtxbGsYayYWITinGDQcCnhLog==",
+          "requires": {
+            "@babel/runtime": "^7.0.0"
+          }
+        }
+      }
+    },
    "@atlaskit/button": {
      "version": "15.1.4",
      "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-15.1.4.tgz",
@ -20770,6 +20990,81 @@
        "react-scrolllock": "^5.0.1"
      }
    },
+    "@atlaskit/modal-dialog": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/@atlaskit/modal-dialog/-/modal-dialog-11.2.4.tgz",
+      "integrity": "sha512-+Qe2Ai2qiBCaLm5F144Kn+M8931097mlZTbBppCrhBbanOyZJHrRkzqbCCd5NGGLpfLUZxfZaQYJssrHfGCDnA==",
+      "requires": {
+        "@atlaskit/analytics-next": "^8.0.0",
+        "@atlaskit/blanket": "^11.0.0",
+        "@atlaskit/button": "^15.1.0",
+        "@atlaskit/icon": "^21.1.0",
+        "@atlaskit/portal": "^4.0.0",
+        "@atlaskit/theme": "^11.0.0",
+        "@babel/runtime": "^7.0.0",
+        "@emotion/core": "^10.0.9",
+        "@emotion/styled": "^10.0.7",
+        "exenv": "^1.2.2",
+        "raf-schd": "^2.1.0",
+        "react-focus-lock": "^1.19.1",
+        "react-scrolllock": "^5.0.1",
+        "react-transition-group": "^4.4.1",
+        "react-uid": "^2.2.0",
+        "tiny-invariant": "^0.0.3"
+      },
+      "dependencies": {
+        "@emotion/styled": {
+          "version": "10.3.0",
+          "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-10.3.0.tgz",
+          "integrity": "sha512-GgcUpXBBEU5ido+/p/mCT2/Xx+Oqmp9JzQRuC+a4lYM4i4LBBn/dWvc0rQ19N9ObA8/T4NWMrPNe79kMBDJqoQ==",
+          "requires": {
+            "@emotion/styled-base": "^10.3.0",
+            "babel-plugin-emotion": "^10.0.27"
+          }
+        },
+        "dom-helpers": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
+          "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+          "requires": {
+            "@babel/runtime": "^7.8.7",
+            "csstype": "^3.0.2"
+          }
+        },
+        "focus-lock": {
+          "version": "0.6.8",
+          "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.6.8.tgz",
+          "integrity": "sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og=="
+        },
+        "raf-schd": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-2.1.2.tgz",
+          "integrity": "sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g=="
+        },
+        "react-focus-lock": {
+          "version": "1.19.1",
+          "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-1.19.1.tgz",
+          "integrity": "sha512-TPpfiack1/nF4uttySfpxPk4rGZTLXlaZl7ncZg/ELAk24Iq2B1UUaUioID8H8dneUXqznT83JTNDHDj+kwryw==",
+          "requires": {
+            "@babel/runtime": "^7.0.0",
+            "focus-lock": "^0.6.3",
+            "prop-types": "^15.6.2",
+            "react-clientside-effect": "^1.2.0"
+          }
+        },
+        "react-transition-group": {
+          "version": "4.4.2",
+          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
+          "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+          "requires": {
+            "@babel/runtime": "^7.5.5",
+            "dom-helpers": "^5.0.1",
+            "loose-envify": "^1.4.0",
+            "prop-types": "^15.6.2"
+          }
+        }
+      }
+    },
    "@atlaskit/motion": {
      "version": "0.4.8",
      "resolved": "https://registry.npmjs.org/@atlaskit/motion/-/motion-0.4.8.tgz",
@ -20844,6 +21139,17 @@
        "@emotion/core": "^10.0.9"
      }
    },
+    "@atlaskit/tabs": {
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/@atlaskit/tabs/-/tabs-12.1.2.tgz",
+      "integrity": "sha512-/PbNIwXh0YMoo8pUjLwJfZEe+vtHENhBWuQc1pK4rW7JNBAD0VYrAJ+JLiZ+ZWGFCOoCSneoJguDBH0I2FMrqA==",
+      "requires": {
+        "@atlaskit/analytics-next": "^8.0.0",
+        "@atlaskit/theme": "^11.0.0",
+        "@babel/runtime": "^7.0.0",
+        "@emotion/core": "^10.0.9"
+      }
+    },
    "@atlaskit/tag": {
      "version": "11.2.5",
      "resolved": "https://registry.npmjs.org/@atlaskit/tag/-/tag-11.2.5.tgz",
@ -22642,15 +22948,15 @@
      }
    },
    "@eslint/eslintrc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
-      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
      "dev": true,
      "requires": {
        "ajv": "^6.12.4",
        "debug": "^4.3.2",
        "espree": "^9.4.0",
-        "globals": "^13.19.0",
+        "globals": "^13.15.0",
        "ignore": "^5.2.0",
        "import-fresh": "^3.2.1",
        "js-yaml": "^4.1.0",
@ -22665,9 +22971,9 @@
          "dev": true
        },
        "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
          "dev": true,
          "requires": {
            "type-fest": "^0.20.2"
@ -22700,12 +23006,6 @@
        }
      }
    },
-    "@eslint/js": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
-      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
-      "dev": true
-    },
    "@giphy/js-analytics": {
      "version": "4.0.7",
      "resolved": "https://registry.npmjs.org/@giphy/js-analytics/-/js-analytics-4.0.7.tgz",
@ -22827,14 +23127,14 @@
      }
    },
    "@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz",
+      "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==",
      "dev": true,
      "requires": {
        "@humanwhocodes/object-schema": "^1.2.1",
        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
+        "minimatch": "^3.0.4"
      }
    },
    "@humanwhocodes/module-importer": {
@ -25080,11 +25380,6 @@
        "@types/webrtc": "*"
      }
    },
-    "@types/w3c-web-hid": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/w3c-web-hid/-/w3c-web-hid-1.0.3.tgz",
-      "integrity": "sha512-eTQRkPd2JukZfS9+kRtrBAaTCCb6waGh5X8BJHmH1MiVQPLMYwm4+EvhwFfOo9SDna15o9dFAwmWwN6r/YM53A=="
-    },
    "@types/webgl-ext": {
      "version": "0.0.30",
      "resolved": "https://registry.npmjs.org/@types/webgl-ext/-/webgl-ext-0.0.30.tgz",
@ -27621,16 +27916,14 @@
      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
    },
    "eslint": {
-      "version": "8.35.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
-      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
+      "version": "8.25.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz",
+      "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==",
      "dev": true,
      "requires": {
-        "@eslint/eslintrc": "^2.0.0",
-        "@eslint/js": "8.35.0",
-        "@humanwhocodes/config-array": "^0.11.8",
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.10.5",
        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
        "ajv": "^6.10.0",
        "chalk": "^4.0.0",
        "cross-spawn": "^7.0.2",
@ -27641,19 +27934,19 @@
        "eslint-utils": "^3.0.0",
        "eslint-visitor-keys": "^3.3.0",
        "espree": "^9.4.0",
-        "esquery": "^1.4.2",
+        "esquery": "^1.4.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
        "file-entry-cache": "^6.0.1",
        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
        "grapheme-splitter": "^1.0.4",
        "ignore": "^5.2.0",
        "import-fresh": "^3.0.0",
        "imurmurhash": "^0.1.4",
        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
        "js-sdsl": "^4.1.4",
        "js-yaml": "^4.1.0",
        "json-stable-stringify-without-jsonify": "^1.0.1",
@ -27735,9 +28028,9 @@
          }
        },
        "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.17.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
          "dev": true,
          "requires": {
            "type-fest": "^0.20.2"
@ -28049,9 +28342,9 @@
      "dev": true
    },
    "espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
      "dev": true,
      "requires": {
        "acorn": "^8.8.0",
@ -28073,9 +28366,9 @@
      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
    },
    "esquery": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz",
-      "integrity": "sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
      "dev": true,
      "requires": {
        "estraverse": "^5.1.0"
@ -29213,6 +29506,16 @@
        "resolve-cwd": "^3.0.0"
      }
    },
+    "imports-loader": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz",
+      "integrity": "sha1-8gS180cCoywdt9SNidXoZ6BEElM=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "source-map": "^0.5.6"
+      }
+    },
    "imurmurhash": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@ -30308,8 +30611,8 @@
      }
    },
    "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1589.0.0+d43c349d/lib-jitsi-meet.tgz",
-      "integrity": "sha512-6QuR109o4sq24c9EU73NGLWAdJO+piiEylsqtmOL/B+I2GMTFeIras0tMOl6eQpncpZS5nD9gqiJmTNDnZqWbw==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1578.0.0+5855ca72/lib-jitsi-meet.tgz",
+      "integrity": "sha512-AAEClrQNOVHNO1lKr/F1SOyiduZfI6bql3eiIxC3LZ5cBcyoRVmwI6uiAbLail0VkuKnTecEWcfYZ9lvokxrMw==",
      "requires": {
        "@jitsi/js-utils": "2.0.0",
        "@jitsi/logger": "2.0.0",
@ -32592,9 +32895,9 @@
      }
    },
    "react-native-webrtc": {
-      "version": "106.0.6",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-106.0.6.tgz",
-      "integrity": "sha512-mxRqR/sNZfVnbTM8cd90Y+A23H53jvZ/j0W7MSSFAbsQrj9Jdew1+7tJVTcBieF1S4ytTLI/R95scOQ4+qeE2Q==",
+      "version": "106.0.5",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-106.0.5.tgz",
+      "integrity": "sha512-EINzYpTZh6zXb2lcGH13Ieli1ur3M1FaT8R8WMqfUZEW8/y0WV6yBeQQVz55OA4LtWnBUX0RZyaYQ4aZN4e1Sw==",
      "requires": {
        "adm-zip": "0.5.9",
        "base64-js": "1.5.1",
@ -33877,6 +34180,40 @@
      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
      "dev": true
    },
+    "string-replace-loader": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-3.0.3.tgz",
+      "integrity": "sha512-8c26Dl6H9XmKNj3mFBvaUYR7ImOxQ4YRBFuUju78wXpa1cDpyDYvKmqGg8mfkxdYexQ/BBogB7PELlLnmR08nw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
+      }
+    },
    "string-replace-to-array": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/string-replace-to-array/-/string-replace-to-array-1.0.3.tgz",
@ -34272,6 +34609,11 @@
      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
      "dev": true
    },
+    "tiny-invariant": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-0.0.3.tgz",
+      "integrity": "sha512-SA2YwvDrCITM9fTvHTHRpq9W6L2fBsClbqm3maT5PZux4Z73SPPDYwJMtnoWh6WMgmCkJij/LaOlWiqJqFMK8g=="
+    },
    "tiny-warning": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
--- a/package.json
+++ b/package.json
@ -20,8 +20,10 @@
    "@atlaskit/icon": "21.2.0",
    "@atlaskit/inline-dialog": "13.0.9",
    "@atlaskit/inline-message": "11.0.8",
+    "@atlaskit/modal-dialog": "11.2.4",
    "@atlaskit/multi-select": "15.0.5",
    "@atlaskit/spinner": "15.0.6",
+    "@atlaskit/tabs": "12.1.2",
    "@atlaskit/theme": "11.0.2",
    "@atlaskit/tooltip": "17.1.2",
    "@emotion/react": "11.10.0",
@ -55,7 +57,6 @@
    "@types/amplitude-js": "8.16.2",
    "@types/audioworklet": "0.0.29",
    "@types/w3c-image-capture": "1.0.6",
-    "@types/w3c-web-hid": "1.0.3",
    "@vladmandic/human": "2.6.5",
    "@vladmandic/human-models": "2.5.9",
    "@xmldom/xmldom": "0.7.9",
@ -77,7 +78,7 @@
    "js-md5": "0.6.1",
    "js-sha512": "0.8.0",
    "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1589.0.0+d43c349d/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1578.0.0+5855ca72/lib-jitsi-meet.tgz",
    "lodash": "4.17.21",
    "moment": "2.29.4",
    "moment-duration-format": "2.2.2",
@ -116,7 +117,7 @@
    "react-native-url-polyfill": "1.3.0",
    "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
    "react-native-watch-connectivity": "1.0.11",
-    "react-native-webrtc": "106.0.6",
+    "react-native-webrtc": "106.0.5",
    "react-native-webview": "11.15.1",
    "react-native-youtube-iframe": "2.2.1",
    "react-redux": "7.1.0",
@ -144,6 +145,7 @@
    "@babel/preset-env": "7.16.0",
    "@babel/preset-flow": "7.16.0",
    "@babel/preset-react": "7.16.0",
+    "@babel/runtime": "7.16.0",
    "@jitsi/eslint-config": "4.1.5",
    "@types/js-md5": "0.4.3",
    "@types/lodash": "4.14.182",
@ -163,18 +165,20 @@
    "circular-dependency-plugin": "5.2.0",
    "clean-css-cli": "4.3.0",
    "css-loader": "3.6.0",
-    "eslint": "8.35.0",
+    "eslint": "8.25.0",
    "eslint-plugin-flowtype": "8.0.3",
    "eslint-plugin-import": "2.25.2",
    "eslint-plugin-jsdoc": "37.0.3",
    "eslint-plugin-react": "7.26.1",
    "eslint-plugin-react-native": "3.11.0",
    "eslint-plugin-typescript-sort-keys": "2.1.0",
+    "imports-loader": "0.7.1",
    "jetifier": "1.6.4",
    "metro-react-native-babel-preset": "0.67.0",
    "patch-package": "6.4.7",
    "process": "0.11.10",
    "sass": "1.26.8",
+    "string-replace-loader": "3.0.3",
    "style-loader": "3.3.1",
    "traverse": "0.6.6",
    "ts-loader": "9.4.1",
--- a/react/features/always-on-top/AlwaysOnTop.js
+++ b/react/features/always-on-top/AlwaysOnTop.js
@ -199,7 +199,7 @@ export default class AlwaysOnTop extends Component<*, State> {
                        color = { getAvatarColor(displayName, customAvatarBackgrounds) }
                        id = 'avatar'
                        initials = { getInitials(displayName) }
-                        url = { avatarURL } />)
+                        url = { displayName ? null : avatarURL } />)
                </div>
                <div
                    className = 'displayname'
--- a/react/features/app/actions.native.ts
+++ b/react/features/app/actions.native.ts
@ -30,10 +30,12 @@ import {
 // @ts-ignore
 import { screen } from '../mobile/navigation/routes';
 import { clearNotifications } from '../notifications/actions';
+// @ts-ignore
+import { setFatalError } from '../overlay';

 import { addTrackStateToURL, getDefaultURL } from './functions.native';
 import logger from './logger';
-import { IReloadNowOptions, IStore } from './types';
+import { IStore } from './types';

 export * from './actions.any';

@ -44,10 +46,9 @@ export * from './actions.any';
 * @param {string|undefined} uri - The URI to which to navigate. It may be a
 * full URL with an HTTP(S) scheme, a full or partial URI with the app-specific
 * scheme, or a mere room name.
- * @param {Object} [options] - Options.
 * @returns {Function}
 */
-export function appNavigate(uri?: string, options: IReloadNowOptions = {}) {
+export function appNavigate(uri?: string) {
    logger.info(`appNavigate to ${uri}`);

    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
@ -143,10 +144,7 @@ export function appNavigate(uri?: string, options: IReloadNowOptions = {}) {
            dispatch(createDesiredLocalTracks());
            dispatch(clearNotifications());

-            // @ts-ignore
-            const { hidePrejoin } = options;
-
-            if (!hidePrejoin && isPrejoinPageEnabled(getState())) {
+            if (isPrejoinPageEnabled(getState())) {
                navigateRoot(screen.preJoin);
            } else {
                dispatch(connect());
@ -179,6 +177,7 @@ export function maybeRedirectToWelcomePage(options: any) { // eslint-disable-lin
 */
 export function reloadNow() {
    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+        dispatch(setFatalError(undefined));

        const state = getState();
        const { locationURL } = state['features/base/connection'];
@ -189,8 +188,6 @@ export function reloadNow() {

        logger.info(`Reloading the conference using URL: ${locationURL}`);

-        dispatch(appNavigate(toURLString(newURL), {
-            hidePrejoin: true
-        }));
+        dispatch(appNavigate(toURLString(newURL)));
    };
 }
--- a/react/features/app/actions.web.ts
+++ b/react/features/app/actions.web.ts
@ -20,6 +20,7 @@ import {
 import { isVpaasMeeting } from '../jaas/functions';
 import { clearNotifications, showNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../notifications/constants';
+import { setFatalError } from '../overlay/actions';
 import { isWelcomePageEnabled } from '../welcome/functions';

 import {
@ -221,6 +222,7 @@ export function maybeRedirectToWelcomePage(options: { feedbackSubmitted?: boolea
 */
 export function reloadNow() {
    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+        dispatch(setFatalError(undefined));

        const state = getState();
        const { locationURL } = state['features/base/connection'];
--- a/react/features/app/components/AbstractApp.js
+++ b/react/features/app/components/AbstractApp.js
@ -1,7 +1,10 @@
-import React from 'react';
+// @flow
+
+import React, { Fragment } from 'react';

 import { BaseApp } from '../../base/app';
 import { toURLString } from '../../base/util';
+import { OverlayContainer } from '../../overlay';
 import { appNavigate } from '../actions';
 import { getDefaultURL } from '../functions';

@ -70,7 +73,23 @@ export class AbstractApp extends BaseApp<Props, *> {
        }
    }

-    _createMainElement: (React.ReactElement, Object) => ?React.ReactElement;
+    /**
+     * Creates an extra {@link ReactElement}s to be added (unconditionally)
+     * alongside the main element.
+     *
+     * @abstract
+     * @protected
+     * @returns {ReactElement}
+     */
+    _createExtraElement() {
+        return (
+            <Fragment>
+                <OverlayContainer />
+            </Fragment>
+        );
+    }
+
+    _createMainElement: (React$Element<*>, Object) => ?React$Element<*>;

    /**
     * Gets the default URL to be opened when this {@code App} mounts.
--- a/react/features/app/components/App.web.js
+++ b/react/features/app/components/App.web.js
@ -1,11 +1,12 @@
+// @flow
+
 import { AtlasKitThemeProvider } from '@atlaskit/theme';
-import React, { Fragment } from 'react';
+import React from 'react';

 import GlobalStyles from '../../base/ui/components/GlobalStyles.web';
 import JitsiThemeProvider from '../../base/ui/components/JitsiThemeProvider.web';
 import DialogContainer from '../../base/ui/components/web/DialogContainer';
 import { ChromeExtensionBanner } from '../../chrome-extension-banner';
-import OverlayContainer from '../../overlay/components/web/OverlayContainer';

 import { AbstractApp } from './AbstractApp';

@ -13,30 +14,12 @@ import { AbstractApp } from './AbstractApp';
 import '../middlewares';
 import '../reducers';

-
 /**
 * Root app {@code Component} on Web/React.
 *
 * @augments AbstractApp
 */
 export class App extends AbstractApp {
-
-    /**
-     * Creates an extra {@link ReactElement}s to be added (unconditionally)
-     * alongside the main element.
-     *
-     * @abstract
-     * @protected
-     * @returns {ReactElement}
-     */
-    _createExtraElement() {
-        return (
-            <Fragment>
-                <OverlayContainer />
-            </Fragment>
-        );
-    }
-
    /**
     * Overrides the parent method to inject {@link AtlasKitThemeProvider} as
     * the top most component.
--- a/react/features/app/middlewares.any.ts
+++ b/react/features/app/middlewares.any.ts
@ -48,6 +48,5 @@ import '../transcribing/middleware';
 import '../video-layout/middleware';
 import '../video-quality/middleware';
 import '../videosipgw/middleware';
-import '../visitors/middleware';

 import './middleware';
--- a/react/features/app/middlewares.web.ts
+++ b/react/features/app/middlewares.web.ts
@ -5,6 +5,7 @@ import '../base/media/middleware';
 import '../dynamic-branding/middleware';
 import '../e2ee/middleware';
 import '../external-api/middleware';
+import '../keyboard-shortcuts/middleware';
 import '../no-audio-signal/middleware';
 import '../notifications/middleware';
 import '../noise-detection/middleware';
@ -14,12 +15,12 @@ import '../prejoin/middleware';
 import '../remote-control/middleware';
 import '../screen-share/middleware';
 import '../shared-video/middleware';
-import '../web-hid/middleware';
 import '../settings/middleware';
 import '../talk-while-muted/middleware';
 import '../toolbox/middleware';
 import '../face-landmarks/middleware';
 import '../gifs/middleware';
 import '../whiteboard/middleware';
+import '../base/dialog/middleware';

 import './middlewares.any';
--- a/react/features/app/reducers.any.ts
+++ b/react/features/app/reducers.any.ts
@ -56,4 +56,3 @@ import '../transcribing/reducer';
 import '../video-layout/reducer';
 import '../video-quality/reducer';
 import '../videosipgw/reducer';
-import '../visitors/reducer';
--- a/react/features/app/reducers.web.ts
+++ b/react/features/app/reducers.web.ts
@ -16,6 +16,5 @@ import '../screenshot-capture/reducer';
 import '../talk-while-muted/reducer';
 import '../virtual-background/reducer';
 import '../whiteboard/reducer';
-import '../web-hid/reducer';

 import './reducers.any';
--- a/react/features/app/types.ts
+++ b/react/features/app/types.ts
@ -76,8 +76,6 @@ import { IVideoLayoutState } from '../video-layout/reducer';
 import { IVideoQualityPersistedState, IVideoQualityState } from '../video-quality/reducer';
 import { IVideoSipGW } from '../videosipgw/reducer';
 import { IVirtualBackground } from '../virtual-background/reducer';
-import { IVisitorsState } from '../visitors/reducer';
-import { IWebHid } from '../web-hid/reducer';
 import { IWhiteboardState } from '../whiteboard/reducer';

 export interface IStore {
@ -165,11 +163,5 @@ export interface IReduxState {
    'features/video-quality-persistent-storage': IVideoQualityPersistedState;
    'features/videosipgw': IVideoSipGW;
    'features/virtual-background': IVirtualBackground;
-    'features/visitors': IVisitorsState;
-    'features/web-hid': IWebHid;
    'features/whiteboard': IWhiteboardState;
 }
-
-export interface IReloadNowOptions {
-    hidePrejoin?: boolean;
-}
--- a/react/features/authentication/actions.any.ts
+++ b/react/features/authentication/actions.any.ts
@ -98,7 +98,7 @@ function _upgradeRoleFinished(
            name: authenticationError || connectionError,
            ...other
        };
-        progress = 0;
+        progress = authenticationError ? 0.5 : 0;
    }

    return {
--- a/react/features/authentication/components/web/LoginDialog.tsx
+++ b/react/features/authentication/components/web/LoginDialog.tsx
@ -207,7 +207,7 @@ class LoginDialog extends Component<IProps, IState> {
        let messageKey;

        if (progress && progress < 1) {
-            messageKey = 'connection.FETCH_SESSION_ID';
+            messageKey = t('connection.FETCH_SESSION_ID');
        } else if (error) {
            const { name } = error;

@ -218,14 +218,14 @@ class LoginDialog extends Component<IProps, IState> {
                    && credentials.jid === toJid(username, configHosts ?? { authdomain: '',
                        domain: '' })
                    && credentials.password === password) {
-                    messageKey = 'dialog.incorrectPassword';
+                    messageKey = t('dialog.incorrectPassword');
                }
            } else if (name) {
-                messageKey = 'dialog.connectErrorWithMsg';
+                messageKey = t('dialog.connectErrorWithMsg');
                messageOptions.msg = `${name} ${error.message}`;
            }
        } else if (connecting) {
-            messageKey = 'connection.CONNECTING';
+            messageKey = t('connection.CONNECTING');
        }

        if (messageKey) {
--- a/react/features/base/components/participants-pane-list/ListItem.tsx
+++ b/react/features/base/components/participants-pane-list/ListItem.tsx
@ -88,7 +88,7 @@ const useStyles = makeStyles()(theme => {
            boxShadow: 'inset 0px -1px 0px rgba(255, 255, 255, 0.15)',
            minHeight: '40px',

-            '&:hover, &:focus-within': {
+            '&:hover': {
                backgroundColor: theme.palette.ui02,

                '& .indicators': {
@ -97,8 +97,6 @@ const useStyles = makeStyles()(theme => {

                '& .actions': {
                    display: 'flex',
-                    position: 'relative',
-                    top: 'auto',
                    boxShadow: `-15px 0px 10px -5px ${theme.palette.ui02}`,
                    backgroundColor: theme.palette.ui02
                }
@ -156,8 +154,7 @@ const useStyles = makeStyles()(theme => {
        },

        actionsContainer: {
-            position: 'absolute',
-            top: '-1000px',
+            display: 'none',
            boxShadow: `-15px 0px 10px -5px ${theme.palette.ui02}`,
            backgroundColor: theme.palette.ui02
        },
--- a/react/features/base/config/actions.ts
+++ b/react/features/base/config/actions.ts
@ -98,7 +98,7 @@ export function overwriteConfig(config: Object) {
 * base/config.
 * @returns {Function}
 */
-export function setConfig(config: IConfig = {}) {
+export function setConfig(config: Object = {}) {
    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const { locationURL } = getState()['features/base/connection'];

@ -119,26 +119,6 @@ export function setConfig(config: IConfig = {}) {
                window.interfaceConfig,
                locationURL);

-        let { bosh } = config;
-
-        if (bosh) {
-            // Normalize the BOSH URL.
-            if (bosh.startsWith('//')) {
-                // By default our config.js doesn't include the protocol.
-                bosh = `${locationURL?.protocol}${bosh}`;
-            } else if (bosh.startsWith('/')) {
-                // Handle relative URLs, which won't work on mobile.
-                const {
-                    protocol,
-                    host,
-                    contextRoot
-                } = parseURIString(locationURL?.href);
-
-                bosh = `${protocol}//${host}${contextRoot || '/'}${bosh.substr(1)}`;
-            }
-            config.bosh = bosh;
-        }
-
        dispatch({
            type: SET_CONFIG,
            config
--- a/react/features/base/config/configType.ts
+++ b/react/features/base/config/configType.ts
@ -388,11 +388,6 @@ export interface IConfig {
    lastNLimits?: {
        [key: number]: number;
    };
-    legalUrls?: {
-        helpCentre: string;
-        privacy: string;
-        terms: string;
-    };
    liveStreaming?: {
        dataPrivacyLink?: string;
        enabled?: boolean;
--- a/react/features/base/config/constants.ts
+++ b/react/features/base/config/constants.ts
@ -61,11 +61,6 @@ export const PREMEETING_BUTTONS = [ 'microphone', 'camera', 'select-background',
  */
 export const THIRD_PARTY_PREJOIN_BUTTONS = [ 'microphone', 'camera', 'select-background' ];

-/**
- * The toolbar buttons to show when in visitors mode.
- */
-export const VISITORS_MODE_BUTTONS = [ 'hangup', 'tileview' ];
-
 /**
 * The set of feature flags.
 *
@ -75,18 +70,3 @@ export const VISITORS_MODE_BUTTONS = [ 'hangup', 'tileview' ];
 export const FEATURE_FLAGS = {
    SSRC_REWRITING: 'ssrcRewritingEnabled'
 };
-
-/**
- * The URL at which the terms (of service/use) are available to the user.
- */
-export const DEFAULT_TERMS_URL = 'https://jitsi.org/meet/terms';
-
-/**
- * The URL at which the privacy policy is available to the user.
- */
-export const DEFAULT_PRIVACY_URL = 'https://jitsi.org/meet/privacy';
-
-/**
- * The URL at which the help centre is available to the user.
- */
-export const DEFAULT_HELP_CENTRE_URL = 'https://web-cdn.jitsi.net/faq/meet-faq.html';
--- a/react/features/base/config/functions.any.ts
+++ b/react/features/base/config/functions.any.ts
@ -11,13 +11,7 @@ import { parseURLParams } from '../util/parseURLParams';

 import { IConfig } from './configType';
 import CONFIG_WHITELIST from './configWhitelist';
-import {
-    DEFAULT_HELP_CENTRE_URL,
-    DEFAULT_PRIVACY_URL,
-    DEFAULT_TERMS_URL,
-    FEATURE_FLAGS,
-    _CONFIG_STORE_PREFIX
-} from './constants';
+import { FEATURE_FLAGS, _CONFIG_STORE_PREFIX } from './constants';
 import INTERFACE_CONFIG_WHITELIST from './interfaceConfigWhitelist';
 import logger from './logger';

@ -332,24 +326,3 @@ export function getDialOutUrl(state: IReduxState) {
 export function getSecurityUiConfig(state: IReduxState) {
    return state['features/base/config']?.securityUi || {};
 }
-
-/**
- * Returns the terms, privacy and help centre URL's.
- *
- * @param {IReduxState} state - The state of the application.
- * @returns {{
- *  privacy: string,
- *  helpCentre: string,
- *  terms: string
- * }}
- */
-export function getLegalUrls(state: IReduxState) {
-    const helpCentreURL = state['features/base/config']?.helpCentreURL;
-    const configLegalUrls = state['features/base/config']?.legalUrls;
-
-    return {
-        privacy: configLegalUrls?.privacy || DEFAULT_PRIVACY_URL,
-        helpCentre: helpCentreURL || configLegalUrls?.helpCentre || DEFAULT_HELP_CENTRE_URL,
-        terms: configLegalUrls?.terms || DEFAULT_TERMS_URL
-    };
-}
--- a/react/features/base/config/middleware.ts
+++ b/react/features/base/config/middleware.ts
@ -52,7 +52,9 @@ function _setConfig({ dispatch, getState }: IStore, next: Function, action: AnyA
    const settings = state['features/base/settings'];
    const config: IConfig = {};

-    if (typeof settings.disableP2P !== 'undefined') {
+    // FIXME: P2P is currently temporality disabled on mobile.
+    // eslint-disable-next-line no-constant-condition
+    if (false && typeof settings.disableP2P !== 'undefined') {
        config.p2p = { enabled: !settings.disableP2P };
    }

--- a/react/features/base/config/reducer.ts
+++ b/react/features/base/config/reducer.ts
@ -57,8 +57,10 @@ const INITIAL_RN_STATE: IConfig = {
    // than requiring this override here...

    p2p: {
+        // Temporarily disable P2P on mobile while we sort out some (codec?) issues.
+        enabled: false,
        disabledCodec: 'vp9',
-        preferredCodec: 'vp8'
+        preferredCodec: 'h264'
    },

    videoQuality: {
--- a/react/features/base/connection/actions.any.ts
+++ b/react/features/base/connection/actions.any.ts
@ -3,7 +3,8 @@ import _ from 'lodash';
 import { IReduxState } from '../../app/types';
 import {
    appendURLParam,
-    getBackendSafeRoomName
+    getBackendSafeRoomName,
+    parseURIString
 } from '../util/uri';

 import {
@ -144,8 +145,7 @@ export function constructOptions(state: IReduxState) {
    // redux store.
    const options = _.cloneDeep(state['features/base/config']);

-    const { bosh } = options;
-    let { websocket } = options;
+    let { bosh, websocket } = options;

    // TESTING: Only enable WebSocket for some percentage of users.
    if (websocket && navigator.product === 'ReactNative') {
@ -154,6 +154,25 @@ export function constructOptions(state: IReduxState) {
        }
    }

+    // Normalize the BOSH URL.
+    if (bosh && !websocket) {
+        const { locationURL } = state['features/base/connection'];
+
+        if (bosh.startsWith('//')) {
+            // By default our config.js doesn't include the protocol.
+            bosh = `${locationURL?.protocol}${bosh}`;
+        } else if (bosh.startsWith('/')) {
+            // Handle relative URLs, which won't work on mobile.
+            const {
+                protocol,
+                host,
+                contextRoot
+            } = parseURIString(locationURL?.href);
+
+            bosh = `${protocol}//${host}${contextRoot || '/'}${bosh.substr(1)}`;
+        }
+    }
+
    // WebSocket is preferred over BOSH.
    const serviceUrl = websocket || bosh;

--- a/react/features/base/dialog/components/DialogContent.js
+++ b/react/features/base/dialog/components/DialogContent.js
@ -0,0 +1,43 @@
+// @flow
+
+import React, { Component } from 'react';
+
+import { Container, Text } from '../../react';
+import { type StyleType } from '../../styles';
+
+import styles from './styles';
+
+type Props = {
+
+    /**
+     * Children of the component.
+     */
+    children: string | React$Node,
+
+    style: ?StyleType
+};
+
+/**
+ * Generic dialog content container to provide the same styling for all custom
+ * dialogs.
+ */
+export default class DialogContent extends Component<Props> {
+    /**
+     * Implements {@code Component#render}.
+     *
+     * @inheritdoc
+     */
+    render() {
+        const { children, style } = this.props;
+
+        const childrenComponent = typeof children === 'string'
+            ? <Text style = { style }>{ children }</Text>
+            : children;
+
+        return (
+            <Container style = { styles.dialogContainer }>
+                { childrenComponent }
+            </Container>
+        );
+    }
+}
--- a/react/features/base/dialog/components/index.js
+++ b/react/features/base/dialog/components/index.js
@ -1,3 +1,5 @@
 // @flow

 export * from './_';
+
+export { default as DialogContent } from './DialogContent';
--- a/react/features/base/dialog/components/native/ConfirmDialog.js
+++ b/react/features/base/dialog/components/native/ConfirmDialog.js
@ -48,7 +48,7 @@ type Props = {
    /**
     * Dialog title.
     */
-    title?: string
+    title?: string,
 };

 /**
--- a/react/features/base/dialog/components/native/PageReloadDialog.tsx
+++ b/react/features/base/dialog/components/native/PageReloadDialog.tsx
@ -1,231 +0,0 @@
-/* eslint-disable lines-around-comment */
-
-// @ts-ignore
-import { randomInt } from '@jitsi/js-utils/random';
-import React, { Component } from 'react';
-import { WithTranslation } from 'react-i18next';
-import type { Dispatch } from 'redux';
-
-import { appNavigate, reloadNow } from '../../../../app/actions.native';
-import { IReduxState } from '../../../../app/types';
-import { translate } from '../../../i18n/functions';
-import { isFatalJitsiConnectionError } from '../../../lib-jitsi-meet/functions.native';
-import { connect } from '../../../redux/functions';
-import { hideDialog } from '../../actions';
-// @ts-ignore
-import logger from '../../logger';
-
-// @ts-ignore
-import ConfirmDialog from './ConfirmDialog';
-
-
-/**
- * The type of the React {@code Component} props of
- * {@link PageReloadDialog}.
- */
-interface IPageReloadDialogProps extends WithTranslation {
-    dispatch: Dispatch<any>;
-    isNetworkFailure: boolean;
-    reason: string;
-}
-
-/**
- * The type of the React {@code Component} state of
- * {@link PageReloadDialog}.
- */
-interface IPageReloadDialogState {
-    timeLeft: number;
-}
-
-/**
- * Implements a React Component that is shown before the
- * conference is reloaded.
- * Shows a warning message and counts down towards the re-load.
- */
-class PageReloadDialog extends Component<IPageReloadDialogProps, IPageReloadDialogState> {
-
-    // @ts-ignore
-    _interval: IntervalID;
-    _timeoutSeconds: number;
-
-    /**
-     * Initializes a new PageReloadOverlay instance.
-     *
-     * @param {Object} props - The read-only properties with which the new
-     * instance is to be initialized.
-     * @public
-     */
-    constructor(props: IPageReloadDialogProps) {
-        super(props);
-
-        this._timeoutSeconds = 10 + randomInt(0, 20);
-
-        this.state = {
-            timeLeft: this._timeoutSeconds
-        };
-
-        this._onCancel = this._onCancel.bind(this);
-        this._onReloadNow = this._onReloadNow.bind(this);
-        this._onReconnecting = this._onReconnecting.bind(this);
-    }
-
-    /**
-     * React Component method that executes once component is mounted.
-     *
-     * @inheritdoc
-     * @returns {void}
-     */
-    componentDidMount() {
-        const { timeLeft } = this.state;
-
-        logger.info(
-            `The conference will be reloaded after ${timeLeft} seconds.`
-        );
-
-        this._interval = setInterval(() =>
-            this._onReconnecting(), 1000);
-    }
-
-    /**
-     * Clears the timer interval.
-     *
-     * @inheritdoc
-     * @returns {void}
-     */
-    componentWillUnmount() {
-        if (this._interval) {
-            clearInterval(this._interval);
-            this._interval = undefined;
-        }
-    }
-
-    /**
-     * Handle clicking of the "Cancel" button. It will navigate back to the
-     * welcome page.
-     *
-     * @private
-     * @returns {boolean}
-     */
-    _onCancel() {
-        const { dispatch } = this.props;
-
-        clearInterval(this._interval);
-        dispatch(appNavigate(undefined));
-
-        return true;
-    }
-
-    /**
-     * Handles automatic reconnection.
-     *
-     * @private
-     * @returns {void}
-     */
-    _onReconnecting() {
-        const { dispatch } = this.props;
-        const { timeLeft } = this.state;
-
-        if (timeLeft === 0) {
-            if (this._interval) {
-                dispatch(hideDialog());
-                this._onReloadNow();
-                this._interval = undefined;
-            }
-        }
-
-        this.setState({
-            timeLeft: timeLeft - 1
-        });
-    }
-
-    /**
-     * Handle clicking on the "Reload Now" button. It will navigate to the same
-     * conference URL as before immediately, without waiting for the timer to
-     * kick in.
-     *
-     * @private
-     * @returns {boolean}
-     */
-    _onReloadNow() {
-        const { dispatch } = this.props;
-
-        clearInterval(this._interval);
-        dispatch(reloadNow());
-
-        return true;
-    }
-
-    /**
-     * Implements React's {@link Component#render()}.
-     *
-     * @inheritdoc
-     * @returns {ReactElement}
-     */
-    render() {
-        const { isNetworkFailure, t } = this.props;
-        const { timeLeft } = this.state;
-
-        let message, title;
-
-        if (isNetworkFailure) {
-            title = 'dialog.conferenceDisconnectTitle';
-            message = 'dialog.conferenceDisconnectMsg';
-        } else {
-            title = 'dialog.conferenceReloadTitle';
-            message = 'dialog.conferenceReloadMsg';
-        }
-
-        return (
-            <ConfirmDialog
-                cancelLabel = 'dialog.Cancel'
-                confirmLabel = 'dialog.rejoinNow'
-                descriptionKey = { `${t(message, { seconds: timeLeft })}` }
-                onCancel = { this._onCancel }
-                onSubmit = { this._onReloadNow }
-                title = { title } />
-        );
-    }
-}
-
-/**
- * Maps (parts of) the redux state to the associated component's props.
- *
- * @param {Object} state - The redux state.
- * @protected
- * @returns {{
- *     isNetworkFailure: boolean,
- *     reason: string
- * }}
- */
-function mapStateToProps(state: IReduxState) {
-    const { error: conferenceError } = state['features/base/conference'];
-    const { error: configError } = state['features/base/config'];
-    const { error: connectionError } = state['features/base/connection'];
-    const { fatalError } = state['features/overlay'];
-
-    const fatalConnectionError
-        // @ts-ignore
-        = connectionError && isFatalJitsiConnectionError(connectionError);
-    const fatalConfigError = fatalError === configError;
-
-    const isNetworkFailure = fatalConfigError || fatalConnectionError;
-
-    let reason;
-
-    if (conferenceError) {
-        reason = `error.conference.${conferenceError.name}`;
-    } else if (connectionError) {
-        reason = `error.conference.${connectionError.name}`;
-    } else if (configError) {
-        reason = `error.config.${configError.name}`;
-    } else {
-        logger.error('No reload reason defined!');
-    }
-
-    return {
-        isNetworkFailure,
-        reason
-    };
-}
-
-export default translate(connect(mapStateToProps)(PageReloadDialog));
--- a/react/features/base/dialog/components/native/index.js
+++ b/react/features/base/dialog/components/native/index.js
@ -5,7 +5,6 @@ export { default as ConfirmDialog } from './ConfirmDialog';
 export { default as DialogContainer } from './DialogContainer';
 export { default as AlertDialog } from './AlertDialog';
 export { default as InputDialog } from './InputDialog';
-export { default as PageReloadDialog } from './PageReloadDialog';

 // NOTE: Some dialogs reuse the style of these base classes for consistency
 // and as we're in a /native namespace, it's safe to export the styles.
--- a/react/features/base/dialog/components/styles.native.js
+++ b/react/features/base/dialog/components/styles.native.js
@ -0,0 +1,14 @@
+import { BoxModel, createStyleSheet } from '../../styles';
+
+/**
+ * The React {@code Component} styles of {@code Dialog}.
+ */
+export default createStyleSheet({
+    /**
+     * Unified container for a consistent Dialog style.
+     */
+    dialogContainer: {
+        paddingHorizontal: BoxModel.padding,
+        paddingVertical: 1.5 * BoxModel.padding
+    }
+});
--- a/react/features/base/dialog/components/styles.web.js
+++ b/react/features/base/dialog/components/styles.web.js
@ -0,0 +1,5 @@
+/**
+ * Placeholder styles for web to be able to use cross platform components
+ * unmodified such as {@code DialogContent}.
+ */
+export default {};
--- a/react/features/base/dialog/components/web/AbstractDialogTab.ts
+++ b/react/features/base/dialog/components/web/AbstractDialogTab.ts
@ -5,6 +5,11 @@ import { Component } from 'react';
 */
 export interface IProps {

+    /**
+     * Function that closes the dialog.
+     */
+    closeDialog: Function;
+
    /**
     * Callback to invoke on change.
     */
--- a/react/features/base/dialog/components/web/Dialog-old.js
+++ b/react/features/base/dialog/components/web/Dialog-old.js
@ -0,0 +1,93 @@
+// @flow
+
+import React from 'react';
+
+import { connect } from '../../../redux';
+import AbstractDialog from '../AbstractDialog';
+import type { Props as AbstractDialogProps, State } from '../AbstractDialog';
+
+import StatelessDialog from './StatelessDialog';
+
+/**
+ * The type of the React {@code Component} props of {@link Dialog}.
+ */
+type Props = AbstractDialogProps & {
+
+    /**
+     * True if listening for the Enter key should be disabled.
+     */
+    disableEnter: boolean,
+
+    /**
+     * Whether the dialog is modal. This means clicking on the blanket will
+     * leave the dialog open. No cancel button.
+     */
+    isModal: boolean,
+
+    /**
+     * Disables rendering of the submit button.
+     */
+    submitDisabled: boolean,
+
+    /**
+     * Width of the dialog, can be:
+     * - 'small' (400px), 'medium' (600px), 'large' (800px),
+     * 'x-large' (968px)
+     * - integer value for pixel width
+     * - string value for percentage.
+     */
+    width: string
+};
+
+/**
+ * Web dialog that uses atlaskit modal-dialog to display dialogs.
+ */
+class Dialog extends AbstractDialog<Props, State> {
+    /**
+     * Initializes a new Dialog instance.
+     *
+     * @param {Object} props - The read-only properties with which the new
+     * instance is to be initialized.
+     */
+    constructor(props: Props) {
+        super(props);
+
+        // Bind event handlers so they are only bound once per instance.
+        this._onCancel = this._onCancel.bind(this);
+        this._onSubmit = this._onSubmit.bind(this);
+    }
+
+    /**
+     * Implements React's {@link Component#render()}.
+     *
+     * @inheritdoc
+     * @returns {ReactElement}
+     */
+    render() {
+        const props = {
+            ...this.props,
+            onCancel: this._onCancel,
+            onSubmit: this._onSubmit
+        };
+
+        // $FlowExpectedError
+        delete props.dispatch;
+
+        return <StatelessDialog { ...props } />;
+    }
+
+    _onCancel: () => void;
+
+    /**
+     * Dispatches action to hide the dialog.
+     *
+     * @returns {void}
+     */
+    _onCancel() {
+        this.props.isModal || super._onCancel();
+    }
+
+    _onSubmit: (?string) => void;
+}
+
+export default connect()(Dialog);
--- a/react/features/base/dialog/components/web/DialogWithTabs.js
+++ b/react/features/base/dialog/components/web/DialogWithTabs.js
@ -0,0 +1,256 @@
+// @flow
+
+import Tabs from '@atlaskit/tabs';
+import React, { Component } from 'react';
+
+import { translate } from '../../../i18n/functions';
+import logger from '../../logger';
+
+import StatelessDialog from './StatelessDialog';
+
+/**
+ * The type of the React {@code Component} props of {@link DialogWithTabs}.
+ */
+export type Props = {
+
+    /**
+     * Function that closes the dialog.
+     */
+    closeDialog: Function,
+
+    /**
+     * Css class name that will be added to the dialog.
+     */
+    cssClassName: string,
+
+    /**
+     * Which settings tab should be initially displayed. If not defined then
+     * the first tab will be displayed.
+     */
+    defaultTab: number,
+
+    /**
+     * Disables dismissing the dialog when the blanket is clicked. Enabled
+     * by default.
+     */
+    disableBlanketClickDismiss: boolean,
+
+    /**
+     * Callback invoked when the Save button has been pressed.
+     */
+    onSubmit: Function,
+
+
+    /**
+     * Invoked to obtain translated strings.
+     */
+    t: Function,
+
+    /**
+     * Information about the tabs that will be rendered.
+     */
+    tabs: Array<Object>,
+
+    /**
+     * Key to use for showing a title.
+     */
+    titleKey: string
+
+};
+
+/**
+ * The type of the React {@code Component} state of {@link DialogWithTabs}.
+ */
+type State = {
+
+    /**
+     * The index of the tab that should be displayed.
+     */
+    selectedTab: number,
+
+    /**
+     * An array of the states of the tabs.
+     */
+    tabStates: Array<Object>
+};
+
+/**
+ * A React {@code Component} for displaying a dialog with tabs.
+ *
+ * @augments Component
+ */
+class DialogWithTabs extends Component<Props, State> {
+    /**
+     * Initializes a new {@code DialogWithTabs} instance.
+     *
+     * @param {Object} props - The read-only React {@code Component} props with
+     * which the new instance is to be initialized.
+     */
+    constructor(props: Props) {
+        super(props);
+        this.state = {
+            selectedTab: this.props.defaultTab || 0,
+            tabStates: this.props.tabs.map(tab => tab.props)
+        };
+        this._onSubmit = this._onSubmit.bind(this);
+        this._onTabSelected = this._onTabSelected.bind(this);
+        this._onTabStateChange = this._onTabStateChange.bind(this);
+    }
+
+    /**
+     * Implements React's {@link Component#render()}.
+     *
+     * @inheritdoc
+     * @returns {ReactElement}
+     */
+    render() {
+        const onCancel = this.props.closeDialog;
+
+        return (
+            <StatelessDialog
+                disableBlanketClickDismiss
+                    = { this.props.disableBlanketClickDismiss }
+                onCancel = { onCancel }
+                onSubmit = { this._onSubmit }
+                titleKey = { this.props.titleKey } >
+                <div className = { this.props.cssClassName } >
+                    { this._renderTabs() }
+                </div>
+            </StatelessDialog>
+        );
+    }
+
+    /**
+     * Gets the props to pass into the tab component.
+     *
+     * @param {number} tabId - The index of the tab configuration within
+     * {@link this.state.tabStates}.
+     * @returns {Object}
+     */
+    _getTabProps(tabId) {
+        const { tabs } = this.props;
+        const { tabStates } = this.state;
+        const tabConfiguration = tabs[tabId];
+        const currentTabState = tabStates[tabId];
+
+        if (tabConfiguration.propsUpdateFunction) {
+            return tabConfiguration.propsUpdateFunction(
+                currentTabState,
+                tabConfiguration.props);
+        }
+
+        return { ...currentTabState };
+    }
+
+    _onTabSelected: (Object, number) => void;
+
+    /**
+     * Callback invoked when the desired tab to display should be changed.
+     *
+     * @param {Object} tab - The configuration passed into atlaskit tabs to
+     * describe how to display the selected tab.
+     * @param {number} tabIndex - The index of the tab within the array of
+     * displayed tabs.
+     * @private
+     * @returns {void}
+     */
+    _onTabSelected(tab, tabIndex) { // eslint-disable-line no-unused-vars
+        this.setState({ selectedTab: tabIndex });
+    }
+
+    /**
+     * Renders the tabs from the tab information passed on props.
+     *
+     * @returns {void}
+     */
+    _renderTabs() {
+        const { t, tabs } = this.props;
+
+        if (tabs.length === 1) {
+            return this._renderTab({
+                ...tabs[0],
+                tabId: 0
+            });
+        }
+
+        if (tabs.length > 1) {
+            return (
+                <Tabs
+                    onSelect = { this._onTabSelected }
+                    selected = { this.state.selectedTab }
+                    tabs = {
+                        tabs.map(({ component, label, styles }, idx) => {
+                            return {
+                                content: this._renderTab({
+                                    component,
+                                    styles,
+                                    tabId: idx
+                                }),
+                                label: t(label)
+                            };
+                        })
+                    } />);
+        }
+
+        logger.warn('No settings tabs configured to display.');
+
+        return null;
+    }
+
+    /**
+     * Renders a tab from the tab information passed as parameters.
+     *
+     * @param {Object} tabInfo - Information about the tab.
+     * @returns {Component} - The tab.
+     */
+    _renderTab({ component, styles, tabId }) {
+        const { closeDialog } = this.props;
+        const TabComponent = component;
+
+        return (
+            <div className = { styles }>
+                <TabComponent
+                    closeDialog = { closeDialog }
+                    mountCallback = { this.props.tabs[tabId].onMount }
+                    onTabStateChange
+                        = { this._onTabStateChange }
+                    tabId = { tabId }
+                    { ...this._getTabProps(tabId) } />
+            </div>);
+    }
+
+    _onTabStateChange: (number, Object) => void;
+
+    /**
+     * Changes the state for a tab.
+     *
+     * @param {number} tabId - The id of the tab which state will be changed.
+     * @param {Object} state - The new state.
+     * @returns {void}
+     */
+    _onTabStateChange(tabId, state) {
+        const tabStates = [ ...this.state.tabStates ];
+
+        tabStates[tabId] = state;
+        this.setState({ tabStates });
+    }
+
+    _onSubmit: () => void;
+
+    /**
+     * Submits the information filled in the dialog.
+     *
+     * @returns {void}
+     */
+    _onSubmit() {
+        const { onSubmit, tabs } = this.props;
+
+        tabs.forEach(({ submit }, idx) => {
+            submit && submit(this.state.tabStates[idx]);
+        });
+
+        onSubmit();
+    }
+}
+
+export default translate(DialogWithTabs);
--- a/react/features/base/dialog/components/web/ModalHeader.tsx
+++ b/react/features/base/dialog/components/web/ModalHeader.tsx
@ -0,0 +1,172 @@
+/* eslint-disable lines-around-comment */
+/* eslint-disable react/no-multi-comp */
+import ErrorIcon from '@atlaskit/icon/glyph/error';
+import WarningIcon from '@atlaskit/icon/glyph/warning';
+import {
+    Header,
+    Title,
+    TitleText,
+    titleIconWrapperStyles
+    // @ts-ignore
+} from '@atlaskit/modal-dialog/dist/es2019/styled/Content';
+import { Theme } from '@mui/material';
+import { withStyles } from '@mui/styles';
+import React from 'react';
+import { WithTranslation } from 'react-i18next';
+
+import { translate } from '../../../i18n/functions';
+import { IconCloseLarge } from '../../../icons/svg';
+import { withPixelLineHeight } from '../../../styles/functions.web';
+import Button from '../../../ui/components/web/Button';
+import { BUTTON_TYPES } from '../../../ui/constants.web';
+
+const TitleIcon = ({ appearance }: { appearance?: 'danger' | 'warning'; }) => {
+    if (!appearance) {
+        return null;
+    }
+
+    const IconSymbol = appearance === 'danger' ? ErrorIcon : WarningIcon;
+
+    return (
+        <span css = { titleIconWrapperStyles(appearance) }>
+            <IconSymbol label = { `${appearance} icon` } />
+        </span>
+    );
+};
+
+interface IProps extends WithTranslation {
+    appearance?: 'danger' | 'warning';
+    classes: any;
+    heading: string;
+    hideCloseIconButton: boolean;
+    id?: string;
+    isHeadingMultiline: boolean;
+    onClose: (e?: any) => void;
+    showKeyline: boolean;
+    testId?: string;
+}
+
+/**
+ * Creates the styles for the component.
+ *
+ * @param {Object} theme - The current UI theme.
+ *
+ * @returns {Object}
+ */
+const styles = (theme: Theme) => {
+    return {
+        closeButton: {
+            borderRadius: theme.shape.borderRadius,
+            cursor: 'pointer',
+            padding: 13,
+
+            [theme.breakpoints.down(480)]: {
+                background: theme.palette.action02
+            },
+
+            '&:hover': {
+                background: theme.palette.ui04
+            }
+        },
+        header: {
+            boxShadow: 'none',
+
+            '& h4': {
+                ...withPixelLineHeight(theme.typography.heading5),
+                color: theme.palette.text01
+            }
+        }
+    };
+};
+
+
+/**
+ * A default header for modal-dialog components.
+ *
+ * @class ModalHeader
+ * @augments {React.Component<IProps>}
+ */
+class ModalHeader extends React.Component<IProps> {
+    static defaultProps = {
+        isHeadingMultiline: true
+    };
+
+    /**
+     * Initializes a new {@code ModalHeader} instance.
+     *
+     * @param {*} props - The read-only properties with which the new instance
+     * is to be initialized.
+     */
+    constructor(props: IProps) {
+        super(props);
+
+        // Bind event handler so it is only bound once for every instance.
+        this._onKeyPress = this._onKeyPress.bind(this);
+    }
+
+    /**
+     * KeyPress handler for accessibility.
+     *
+     * @param {Object} e - The key event to handle.
+     *
+     * @returns {void}
+     */
+    _onKeyPress(e: React.KeyboardEvent) {
+        if (this.props.onClose && (e.key === ' ' || e.key === 'Enter')) {
+            e.preventDefault();
+            this.props.onClose();
+        }
+    }
+
+    /**
+     * Implements React's {@link Component#render()}.
+     *
+     * @inheritdoc
+     * @returns {ReactElement}
+     */
+    render() {
+        const {
+            id,
+            appearance,
+            classes,
+            heading,
+            hideCloseIconButton,
+            onClose,
+            showKeyline,
+            isHeadingMultiline,
+            testId,
+            t
+        } = this.props;
+
+        if (!heading) {
+            return null;
+        }
+
+        return (
+            <Header
+                className = { classes.header }
+                showKeyline = { showKeyline }>
+                <Title>
+                    <TitleIcon appearance = { appearance } />
+                    <TitleText
+                        data-testid = { testId && `${testId}-heading` }
+                        id = { id }
+                        isHeadingMultiline = { isHeadingMultiline }>
+                        {heading}
+                    </TitleText>
+                </Title>
+
+                {
+                    !hideCloseIconButton && <Button
+                        accessibilityLabel = { t('dialog.close') }
+                        icon = { IconCloseLarge }
+                        id = 'modal-header-close-button'
+                        onClick = { onClose }
+                        size = 'large'
+                        type = { BUTTON_TYPES.TERTIARY } />
+                }
+            </Header>
+        );
+    }
+}
+export default translate(withStyles(styles)(ModalHeader));
--- a/react/features/base/dialog/components/web/StatelessDialog.tsx
+++ b/react/features/base/dialog/components/web/StatelessDialog.tsx
@ -0,0 +1,377 @@
+/* eslint-disable lines-around-comment */
+import Modal, { ModalFooter } from '@atlaskit/modal-dialog';
+import { Theme } from '@mui/material';
+import { withStyles } from '@mui/styles';
+import React, { Component, ReactElement } from 'react';
+import { WithTranslation } from 'react-i18next';
+
+import { translate } from '../../../i18n/functions';
+import Button from '../../../ui/components/web/Button';
+import { BUTTON_TYPES } from '../../../ui/constants.web';
+import type { DialogProps } from '../../constants';
+
+import ModalHeader from './ModalHeader';
+
+/**
+ * The ID to be used for the cancel button if enabled.
+ *
+ * @type {string}
+ */
+const CANCEL_BUTTON_ID = 'modal-dialog-cancel-button';
+
+/**
+ * The ID to be used for the ok button if enabled.
+ *
+ * @type {string}
+ */
+const OK_BUTTON_ID = 'modal-dialog-ok-button';
+
+/**
+ * The type of the React {@code Component} props of {@link StatelessDialog}.
+ *
+ * @static
+ */
+interface IProps extends DialogProps, WithTranslation {
+
+    /**
+     * An object containing the CSS classes.
+     */
+    classes: any;
+
+    /**
+     * Custom dialog header that replaces the standard heading.
+     */
+    customHeader?: ReactElement<any> | Function;
+
+    /**
+     * Disables dismissing the dialog when the blanket is clicked. Enabled
+     * by default.
+     */
+    disableBlanketClickDismiss: boolean;
+
+    /*
+     * True if listening for the Enter key should be disabled.
+     */
+    disableEnter: boolean;
+
+    /**
+     * If true, no footer will be displayed.
+     */
+    disableFooter?: boolean;
+
+    /**
+     * If true, the cancel button will not display but cancel actions, like
+     * clicking the blanket, will cancel.
+     */
+    hideCancelButton: boolean;
+
+    /**
+     * If true, the close icon button will not be displayed.
+     */
+    hideCloseIconButton: boolean;
+
+    /**
+     * Whether the dialog is modal. This means clicking on the blanket will
+     * leave the dialog open. No cancel button.
+     */
+    isModal: boolean;
+
+    /**
+     * The handler for the event when clicking the 'confirmNo' button.
+     * Defaults to onCancel if absent.
+     */
+    onDecline?: () => void;
+
+    /**
+     * Callback invoked when setting the ref of the Dialog.
+     */
+    onDialogRef?: Function;
+
+    /**
+     * Disables rendering of the submit button.
+     */
+    submitDisabled: boolean;
+
+    /**
+     * Width of the dialog, can be:
+     * - 'small' (400px), 'medium' (600px), 'large' (800px),
+     *   'x-large' (968px)
+     * - integer value for pixel width
+     * - string value for percentage.
+     */
+    width: string;
+}
+
+/**
+ * Creates the styles for the component.
+ *
+ * @param {Object} theme - The theme.
+ * @returns {Object}
+ */
+const styles = (theme: Theme) => {
+    return {
+        footer: {
+            boxShadow: 'none'
+        },
+
+        buttonContainer: {
+            display: 'flex',
+
+            '& > button:first-child': {
+                marginRight: theme.spacing(2)
+            }
+        }
+    };
+};
+
+/**
+ * Web dialog that uses atlaskit modal-dialog to display dialogs.
+ */
+class StatelessDialog extends Component<IProps> {
+    static defaultProps = {
+        hideCloseIconButton: false
+    };
+
+    /**
+     * Initializes a new {@code StatelessDialog} instance.
+     *
+     * @param {Object} props - The read-only properties with which the new
+     * instance is to be initialized.
+     */
+    constructor(props: IProps) {
+        super(props);
+
+        // Bind event handlers so they are only bound once for every instance.
+        this._onCancel = this._onCancel.bind(this);
+        this._onDialogDismissed = this._onDialogDismissed.bind(this);
+        this._onKeyPress = this._onKeyPress.bind(this);
+        this._onSubmit = this._onSubmit.bind(this);
+        this._renderFooter = this._renderFooter.bind(this);
+        this._onDialogRef = this._onDialogRef.bind(this);
+    }
+
+    /**
+     * Implements React's {@link Component#render()}.
+     *
+     * @inheritdoc
+     * @returns {ReactElement}
+     */
+    render() {
+        const {
+            customHeader,
+            children,
+            hideCloseIconButton,
+            t,
+            titleString,
+            titleKey,
+            width
+        } = this.props;
+
+        return (
+            <Modal
+                autoFocus = { true }
+                components = {{
+                    // @ts-ignore
+                    Header: customHeader ? customHeader : props => (
+                        // @ts-ignore
+                        <ModalHeader
+                            { ...props }
+                            heading = { titleString || t(titleKey ?? '') }
+                            hideCloseIconButton = { hideCloseIconButton } />
+                    )
+                }}
+                footer = { this._renderFooter }
+                i18n = { this.props.i18n }
+                onClose = { this._onDialogDismissed }
+                onDialogDismissed = { this._onDialogDismissed }
+                shouldCloseOnEscapePress = { true }
+                width = { width || 'medium' }>
+                <div
+                    onKeyPress = { this._onKeyPress }
+                    ref = { this._onDialogRef }>
+                    <form
+                        className = 'modal-dialog-form'
+                        id = 'modal-dialog-form'
+                        onSubmit = { this._onSubmit }>
+                        { children }
+                    </form>
+                </div>
+            </Modal>
+        );
+    }
+
+    /**
+     * Returns a ReactElement to display buttons for closing the modal.
+     *
+     * @param {Object} propsFromModalFooter - The props passed in from the
+     * {@link ModalFooter} component.
+     * @private
+     * @returns {ReactElement}
+     */
+    _renderFooter(propsFromModalFooter: any) {
+        // Filter out falsy (null) values because {@code ButtonGroup} will error
+        // if passed in anything but buttons with valid type props.
+        const buttons = [
+            this._renderCancelButton(),
+            this._renderOKButton()
+        ].filter(Boolean);
+
+        if (this.props.disableFooter) {
+            return null;
+        }
+
+        return (
+            <ModalFooter
+                className = { this.props.classes.footer }
+                showKeyline = { propsFromModalFooter.showKeyline } >
+                {
+
+                    /**
+                     * Atlaskit has this empty span (JustifySim) so...
+                     */
+                }
+                <span />
+                <div className = { this.props.classes.buttonContainer }>
+                    { buttons }
+                </div>
+            </ModalFooter>
+        );
+    }
+
+    /**
+     * Dispatches action to hide the dialog.
+     *
+     * @returns {void}
+     */
+    _onCancel() {
+        if (!this.props.isModal) {
+            const { onCancel } = this.props;
+
+            onCancel?.();
+        }
+    }
+
+    /**
+     * Handles click on the blanket area.
+     *
+     * @returns {void}
+     */
+    _onDialogDismissed() {
+        if (!this.props.disableBlanketClickDismiss) {
+            this._onCancel();
+        }
+    }
+
+    /**
+     * Dispatches the action when submitting the dialog.
+     *
+     * @private
+     * @param {string} value - The submitted value if any.
+     * @returns {void}
+     */
+    _onSubmit(value?: any) {
+        const { onSubmit } = this.props;
+
+        onSubmit?.(value);
+    }
+
+    /**
+     * Renders Cancel button.
+     *
+     * @private
+     * @returns {ReactElement|null} The Cancel button if enabled and dialog is
+     * not modal.
+     */
+    _renderCancelButton() {
+        if (this.props.cancelDisabled
+            || this.props.isModal
+            || this.props.hideCancelButton) {
+            return null;
+        }
+
+        const {
+            t,
+            onDecline
+        } = this.props;
+
+        return (
+            <Button
+                accessibilityLabel = { t(this.props.cancelKey || 'dialog.Cancel') }
+                id = { CANCEL_BUTTON_ID }
+                key = { CANCEL_BUTTON_ID }
+                label = { t(this.props.cancelKey || 'dialog.Cancel') }
+                onClick = { onDecline || this._onCancel }
+                size = 'small'
+                type = { BUTTON_TYPES.TERTIARY } />
+        );
+    }
+
+    /**
+     * Renders OK button.
+     *
+     * @private
+     * @returns {ReactElement|null} The OK button if enabled.
+     */
+    _renderOKButton() {
+        const {
+            submitDisabled,
+            t
+        } = this.props;
+
+        if (submitDisabled) {
+            return null;
+        }
+
+        return (
+            <Button
+                accessibilityLabel = { t(this.props.okKey || 'dialog.Ok') }
+                disabled = { this.props.okDisabled }
+                id = { OK_BUTTON_ID }
+                key = { OK_BUTTON_ID }
+                label = { t(this.props.okKey || 'dialog.Ok') }
+                onClick = { this._onSubmit }
+                size = 'small' />
+        );
+    }
+
+    /**
+     * Callback invoked when setting the ref of the dialog's child passing the Modal ref.
+     * It is done this way because we cannot directly access the ref of the Modal component.
+     *
+     * @param {HTMLElement} element - The DOM element for the dialog.
+     * @private
+     * @returns {void}
+     */
+    _onDialogRef(element?: any) {
+        this.props.onDialogRef?.(element?.parentNode);
+    }
+
+    /**
+     * Handles 'Enter' key in the dialog to submit/hide dialog depending on
+     * the available buttons and their disabled state.
+     *
+     * @param {Object} event - The key event.
+     * @private
+     * @returns {void}
+     */
+    _onKeyPress(event: React.KeyboardEvent) {
+        // If the event coming to the dialog has been subject to preventDefault
+        // we don't handle it here.
+        if (event.defaultPrevented) {
+            return;
+        }
+
+        if (event.key === 'Enter' && !this.props.disableEnter) {
+            event.preventDefault();
+            event.stopPropagation();
+
+            if (this.props.submitDisabled && !this.props.cancelDisabled) {
+                this._onCancel();
+            } else if (!this.props.okDisabled) {
+                this._onSubmit();
+            }
+        }
+    }
+}
+
+export default translate(withStyles(styles)(StatelessDialog));
--- a/react/features/base/dialog/components/web/ThemedDialog.js
+++ b/react/features/base/dialog/components/web/ThemedDialog.js
@ -0,0 +1,31 @@
+// @flow
+
+import {
+    Dialog,
+    FillScreen,
+    PositionerAbsolute,
+    PositionerRelative,
+    dialogHeight,
+    dialogWidth
+} from '@atlaskit/modal-dialog/dist/es2019/styled/Modal.js';
+import { DN50, N0 } from '@atlaskit/theme/colors';
+import { themed } from '@atlaskit/theme/components';
+import React from 'react';
+
+type Props = {
+    isChromeless: boolean
+}
+
+const ThemedDialog = (props: Props) => {
+    const style = { backgroundColor: props.isChromeless ? 'transparent' : themed({ light: N0,
+        dark: DN50 })({ theme: { mode: 'dark' } }) };
+
+    return (<Dialog
+        { ...props }
+        aria-modal = { true }
+        style = { style }
+        theme = {{ mode: 'dark' }} />);
+};
+
+
+export { ThemedDialog as Dialog, FillScreen, dialogWidth, dialogHeight, PositionerAbsolute, PositionerRelative };
--- a/react/features/base/dialog/components/web/index.js
+++ b/react/features/base/dialog/components/web/index.js
@ -2,4 +2,7 @@

 export { default as AbstractDialogTab } from './AbstractDialogTab';
 export type { Props as AbstractDialogTabProps } from './AbstractDialogTab';
+export { default as Dialog } from './Dialog-old';
+export { default as DialogWithTabs } from './DialogWithTabs';
+export { default as StatelessDialog } from './StatelessDialog';
 export { default as DialogContainer } from '../../../ui/components/web/DialogContainer';
--- a/react/features/base/dialog/middleware.web.ts
+++ b/react/features/base/dialog/middleware.web.ts
@ -0,0 +1,73 @@
+/* eslint-disable lines-around-comment */
+import LoginDialog from '../../authentication/components/web/LoginDialog';
+import WaitForOwnerDialog from '../../authentication/components/web/WaitForOwnerDialog';
+import ChatPrivacyDialog from '../../chat/components/web/ChatPrivacyDialog';
+import DesktopPicker from '../../desktop-picker/components/DesktopPicker';
+import DisplayNamePrompt from '../../display-name/components/web/DisplayNamePrompt';
+import ParticipantVerificationDialog from '../../e2ee/components/ParticipantVerificationDialog';
+import EmbedMeetingDialog from '../../embed-meeting/components/EmbedMeetingDialog';
+// @ts-ignore
+import FeedbackDialog from '../../feedback/components/FeedbackDialog.web';
+import AddPeopleDialog from '../../invite/components/add-people-dialog/web/AddPeopleDialog';
+import PremiumFeatureDialog from '../../jaas/components/web/PremiumFeatureDialog';
+import KeyboardShortcutsDialog from '../../keyboard-shortcuts/components/web/KeyboardShortcutsDialog';
+// @ts-ignore
+import StartLiveStreamDialog from '../../recording/components/LiveStream/web/StartLiveStreamDialog';
+// @ts-ignore
+import StopLiveStreamDialog from '../../recording/components/LiveStream/web/StopLiveStreamDialog';
+// @ts-ignore
+import StartRecordingDialog from '../../recording/components/Recording/web/StartRecordingDialog';
+// @ts-ignore
+import StopRecordingDialog from '../../recording/components/Recording/web/StopRecordingDialog';
+// @ts-ignore
+import RemoteControlAuthorizationDialog from '../../remote-control/components/RemoteControlAuthorizationDialog';
+import PasswordRequiredPrompt from '../../room-lock/components/PasswordRequiredPrompt.web';
+import SalesforceLinkDialog from '../../salesforce/components/web/SalesforceLinkDialog';
+import ShareAudioDialog from '../../screen-share/components/web/ShareAudioDialog';
+import ShareScreenWarningDialog from '../../screen-share/components/web/ShareScreenWarningDialog';
+import SecurityDialog from '../../security/components/security-dialog/web/SecurityDialog';
+import LogoutDialog from '../../settings/components/web/LogoutDialog';
+import SharedVideoDialog from '../../shared-video/components/web/SharedVideoDialog';
+import SpeakerStats from '../../speaker-stats/components/web/SpeakerStats';
+import LanguageSelectorDialog from '../../subtitles/components/LanguageSelectorDialog.web';
+import GrantModeratorDialog from '../../video-menu/components/web/GrantModeratorDialog';
+import KickRemoteParticipantDialog from '../../video-menu/components/web/KickRemoteParticipantDialog';
+import MuteEveryoneDialog from '../../video-menu/components/web/MuteEveryoneDialog';
+import MuteEveryonesVideoDialog from '../../video-menu/components/web/MuteEveryonesVideoDialog';
+import MuteRemoteParticipantsVideoDialog from '../../video-menu/components/web/MuteRemoteParticipantsVideoDialog';
+// @ts-ignore
+import VideoQualityDialog from '../../video-quality/components/VideoQualityDialog.web';
+import VirtualBackgroundDialog from '../../virtual-background/components/VirtualBackgroundDialog';
+import MiddlewareRegistry from '../redux/MiddlewareRegistry';
+
+import { OPEN_DIALOG } from './actionTypes';
+
+// ! IMPORTANT - This whole middleware is only needed for the transition from from @atlaskit dialog to our component.
+// ! It should be removed when the transition is over.
+
+const NEW_DIALOG_LIST = [ KeyboardShortcutsDialog, ChatPrivacyDialog, DisplayNamePrompt, EmbedMeetingDialog,
+    FeedbackDialog, AddPeopleDialog, PremiumFeatureDialog, StartLiveStreamDialog, StopLiveStreamDialog,
+    StartRecordingDialog, StopRecordingDialog, ShareAudioDialog, ShareScreenWarningDialog, SecurityDialog,
+    SharedVideoDialog, SpeakerStats, LanguageSelectorDialog, MuteEveryoneDialog, MuteEveryonesVideoDialog,
+    GrantModeratorDialog, KickRemoteParticipantDialog, MuteRemoteParticipantsVideoDialog, VideoQualityDialog,
+    VirtualBackgroundDialog, LoginDialog, WaitForOwnerDialog, DesktopPicker, RemoteControlAuthorizationDialog,
+    LogoutDialog, SalesforceLinkDialog, ParticipantVerificationDialog, PasswordRequiredPrompt ];
+
+// This function is necessary while the transition from @atlaskit dialog to our component is ongoing.
+const isNewDialog = (component: any) => NEW_DIALOG_LIST.some(comp => comp === component);
+
+/**
+ * Implements the entry point of the middleware of the feature base/media.
+ *
+ * @param {IStore} store - The redux store.
+ * @returns {Function}
+ */
+MiddlewareRegistry.register(() => (next: Function) => (action: any) => {
+    switch (action.type) {
+    case OPEN_DIALOG: {
+        action.isNewDialog = isNewDialog(action.component);
+    }
+    }
+
+    return next(action);
+});
--- a/react/features/base/dialog/reducer.ts
+++ b/react/features/base/dialog/reducer.ts
@ -13,6 +13,7 @@ import {
 export interface IDialogState {
    component?: ComponentType;
    componentProps?: Object;
+    isNewDialog?: boolean;
    sheet?: ComponentType;
    sheetProps?: Object;
 }
@ -43,7 +44,8 @@ ReducerRegistry.register<IDialogState>('features/base/dialog', (state = {}, acti
    case OPEN_DIALOG:
        return assign(state, {
            component: action.component,
-            componentProps: action.componentProps
+            componentProps: action.componentProps,
+            isNewDialog: action.isNewDialog
        });

    case HIDE_SHEET:
--- a/react/features/base/icons/svg/bell.svg
+++ b/react/features/base/icons/svg/bell.svg
@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12 1.5C11.5858 1.5 11.25 1.83579 11.25 2.25V3C11.25 3.01239 11.2503 3.0247 11.2509 3.03694C7.46047 3.41282 4.5 6.61068 4.5 10.5V12.0949C4.5 12.9852 4.10453 13.8296 3.42055 14.3995L3.07702 14.6858C2.55299 15.1225 2.25 15.7694 2.25 16.4515C2.25 17.7209 3.27906 18.75 4.54846 18.75H8.25C8.25 20.8211 9.92893 22.5 12 22.5C14.0711 22.5 15.75 20.8211 15.75 18.75H19.3635C20.6815 18.75 21.75 17.6815 21.75 16.3635C21.75 15.7306 21.4986 15.1236 21.051 14.676L20.3787 14.0037C19.8161 13.4411 19.5 12.678 19.5 11.8824V10.5C19.5 6.61068 16.5395 3.41282 12.7491 3.03694C12.7497 3.0247 12.75 3.01239 12.75 3V2.25C12.75 1.83579 12.4142 1.5 12 1.5ZM18 10.5C18 7.18629 15.3137 4.5 12 4.5C8.68629 4.5 6 7.18629 6 10.5V12.7974C6 13.6878 5.60453 14.5321 4.92055 15.1021L4.0373 15.8381C3.85526 15.9898 3.75 16.2146 3.75 16.4515C3.75 16.8925 4.10748 17.25 4.54846 17.25H19.3635C19.8531 17.25 20.25 16.8531 20.25 16.3635C20.25 16.1284 20.1566 15.9029 19.9904 15.7367L18.8787 14.625C18.3161 14.0624 18 13.2993 18 12.5037V10.5ZM14.25 18.75H9.75C9.75 19.9926 10.7574 21 12 21C13.2426 21 14.25 19.9926 14.25 18.75Z" fill="white"/>
-</svg>
--- a/react/features/base/icons/svg/favorite-solid.svg
+++ b/react/features/base/icons/svg/favorite-solid.svg
@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.7158 3.03843C12.4964 2.33696 11.5037 2.33696 11.2842 3.03843L9.54263 8.60636C9.44381 8.92229 9.14957 9.13606 8.81858 9.13242L2.98497 9.0682C2.25003 9.06011 1.94325 10.0043 2.54258 10.4297L7.29982 13.8067C7.56974 13.9983 7.68213 14.3442 7.57638 14.6579L5.71262 20.1861C5.47782 20.8826 6.28099 21.4661 6.87081 21.0276L11.5525 17.5467C11.8182 17.3492 12.1819 17.3492 12.4475 17.5467L17.1293 21.0276C17.7191 21.4661 18.5223 20.8826 18.2875 20.1861L16.4237 14.6579C16.3179 14.3442 16.4303 13.9983 16.7003 13.8067L21.4575 10.4297C22.0568 10.0043 21.75 9.06011 21.0151 9.0682L15.1815 9.13242C14.8505 9.13606 14.5563 8.92228 14.4574 8.60636L12.7158 3.03843Z" />
-</svg>
--- a/react/features/base/icons/svg/favorite.svg
+++ b/react/features/base/icons/svg/favorite.svg
@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12 5.77465L10.9742 9.05416C10.6778 10.0019 9.79505 10.6433 8.80206 10.6323L5.36607 10.5945L8.16808 12.5835C8.97785 13.1583 9.31502 14.1961 8.99778 15.1371L7.90002 18.3932L10.6576 16.343C11.4545 15.7505 12.5456 15.7505 13.3425 16.343L16.1001 18.3932L15.0023 15.1371C14.6851 14.1961 15.0222 13.1583 15.832 12.5835L18.634 10.5945L15.198 10.6323C14.205 10.6433 13.3223 10.0019 13.0258 9.05416L12 5.77465ZM12.7158 3.03843C12.4964 2.33696 11.5037 2.33696 11.2842 3.03843L9.54263 8.60636C9.44381 8.92229 9.14957 9.13606 8.81858 9.13242L2.98497 9.0682C2.25003 9.06011 1.94325 10.0043 2.54258 10.4297L7.29982 13.8067C7.56974 13.9983 7.68213 14.3442 7.57638 14.6579L5.71262 20.1861C5.47782 20.8826 6.28099 21.4661 6.87081 21.0276L11.5525 17.5467C11.8182 17.3492 12.1819 17.3492 12.4475 17.5467L17.1293 21.0276C17.7191 21.4661 18.5223 20.8826 18.2875 20.1861L16.4237 14.6579C16.3179 14.3442 16.4303 13.9983 16.7003 13.8067L21.4575 10.4297C22.0568 10.0043 21.75 9.06011 21.0151 9.0682L15.1815 9.13242C14.8505 9.13606 14.5563 8.92228 14.4574 8.60636L12.7158 3.03843Z" fill="white"/>
-</svg>
--- a/react/features/base/icons/svg/host.svg
+++ b/react/features/base/icons/svg/host.svg
@ -1,6 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.1602 8.24439C13.3281 8.16225 14.25 7.18879 14.25 6C14.25 4.75736 13.2426 3.75 12 3.75C10.7574 3.75 9.75 4.75736 9.75 6C9.75 7.18151 10.6607 8.15032 11.8184 8.24278C11.5197 8.21896 11.2375 8.13687 10.9831 8.00775C9.85816 9.83693 8.19346 10.3318 6.74461 10.3424C6.66364 9.17333 5.68961 8.25 4.5 8.25C3.25736 8.25 2.25 9.25736 2.25 10.5C2.25 11.7426 3.25736 12.75 4.5 12.75C5.32135 12.75 6.03995 12.31 6.43279 11.6528C6.39557 11.715 6.35542 11.7754 6.31253 11.8336C6.67901 11.8506 7.06503 11.8447 7.4618 11.805C8.64456 11.6868 9.95784 11.2623 11.0918 10.2228C11.4736 9.87283 11.8205 9.46641 12.1289 9.0006C12.4727 9.47803 12.8468 9.89069 13.2474 10.2432C14.3929 11.2513 15.6592 11.6829 16.8118 11.8042C17.1152 11.8362 17.4101 11.8467 17.6932 11.8412C17.6739 11.8152 17.6551 11.7887 17.6369 11.7619C18.0415 12.3582 18.725 12.75 19.5 12.75C20.7426 12.75 21.75 11.7426 21.75 10.5C21.75 9.25736 20.7426 8.25 19.5 8.25C18.3129 8.25 17.3405 9.16938 17.256 10.335C15.9245 10.2658 14.3912 9.7053 13.1957 7.90649C12.8918 8.09752 12.5389 8.21778 12.1602 8.24439ZM12 6.75C12.4142 6.75 12.75 6.41421 12.75 6C12.75 5.58579 12.4142 5.25 12 5.25C11.5858 5.25 11.25 5.58579 11.25 6C11.25 6.41421 11.5858 6.75 12 6.75ZM20.25 10.5C20.25 10.9142 19.9142 11.25 19.5 11.25C19.0858 11.25 18.75 10.9142 18.75 10.5C18.75 10.0858 19.0858 9.75 19.5 9.75C19.9142 9.75 20.25 10.0858 20.25 10.5ZM4.5 11.25C4.91421 11.25 5.25 10.9142 5.25 10.5C5.25 10.0858 4.91421 9.75 4.5 9.75C4.08579 9.75 3.75 10.0858 3.75 10.5C3.75 10.9142 4.08579 11.25 4.5 11.25Z" fill="white"/>
-    <path d="M17.9485 12.1296C18.3135 12.4773 18.7952 12.7036 19.3289 12.7437L19.2591 12.9706C19.1623 13.2853 18.8715 13.5 18.5423 13.5C18.0377 13.5 17.677 13.0117 17.8254 12.5294L17.9485 12.1296Z" fill="white"/>
-    <path d="M12.75 18.0001C13.1642 18.0001 13.5 18.3359 13.5 18.7501C13.5 19.1643 13.1642 19.5001 12.75 19.5001H7.85792C7.19941 19.5001 6.61791 19.0706 6.42425 18.4412L4.6712 12.7437C5.20487 12.7036 5.6866 12.4773 6.05164 12.1296L7.85792 18.0001H12.75Z" fill="white"/>
-    <path d="M11.25 18.0002C10.8358 18.0002 10.5 18.336 10.5 18.7502C10.5 19.1644 10.8358 19.5002 11.25 19.5002H16.1421C16.8006 19.5002 17.3821 19.0707 17.5757 18.4413L19.3289 12.7437C18.7952 12.7036 18.3135 12.4773 17.9485 12.1296L16.1421 18.0002H11.25Z" fill="white"/>
-</svg>
--- a/react/features/base/icons/svg/index.ts
+++ b/react/features/base/icons/svg/index.ts
@ -8,7 +8,6 @@ export { default as IconArrowUpLarge } from './arrow-up-large.svg';
 export { default as IconAudioOnly } from './visibility.svg';
 export { default as IconAudioOnlyOff } from './visibility-off.svg';
 export { default as IconBluetooth } from './bluetooth.svg';
-export { default as IconBell } from './bell.svg';
 export { default as IconCalendar } from './calendar.svg';
 export { default as IconCameraRefresh } from './camera-refresh.svg';
 export { default as IconCar } from './car.svg';
@ -39,13 +38,10 @@ export { default as IconExclamationSolid } from './exclamation-solid.svg';
 export { default as IconExclamationTriangle } from './exclamation-triangle.svg';
 export { default as IconExitFullscreen } from './exit-fullscreen.svg';
 export { default as IconFaceSmile } from './face-smile.svg';
-export { default as IconFavorite } from './favorite.svg';
-export { default as IconFavoriteSolid } from './favorite-solid.svg';
 export { default as IconFeedback } from './feedback.svg';
 export { default as IconGear } from './gear.svg';
 export { default as IconGoogle } from './google.svg';
 export { default as IconHangup } from './hangup.svg';
-export { default as IconHost } from './host.svg';
 export { default as IconHelp } from './help.svg';
 export { default as IconHighlight } from './highlight.svg';
 export { default as IconImage } from './image.svg';
@ -84,7 +80,6 @@ export { default as IconSend } from './send.svg';
 export { default as IconShare } from './share.svg';
 export { default as IconShareDoc } from './share-doc.svg';
 export { default as IconShortcuts } from './shortcuts.svg';
-export { default as IconSip } from './sip.svg';
 export { default as IconSites } from './sites.svg';
 export { default as IconStop } from './stop.svg';
 export { default as IconStopScreenshare } from './stop-screenshare.svg';
@ -93,7 +88,6 @@ export { default as IconTileView } from './tile-view.svg';
 export { default as IconTrash } from './trash.svg';
 export { default as IconUserDeleted } from './user-deleted.svg';
 export { default as IconUsers } from './users.svg';
-export { default as IconUser } from './user.svg';
 export { default as IconVideo } from './video.svg';
 export { default as IconVideoOff } from './video-off.svg';
 export { default as IconVolumeOff } from './volume-off.svg';
--- a/react/features/base/icons/svg/sip.svg
+++ b/react/features/base/icons/svg/sip.svg
@ -1,3 +0,0 @@
-<svg width="20" height="14" viewBox="0 0 20 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.41201 1.90767C3.50689 3.37865 5.24438 7.52348 7.36096 9.64007C7.36096 9.64004 7.36175 9.63923 7.36329 9.63765C9.48 11.7541 13.6215 13.4932 15.0923 12.5882C16.1022 11.9668 16.0078 9.51337 15.2427 8.76783C14.7369 8.2749 13.1882 8.01994 12.5497 8.14762C12.3496 8.18763 11.7907 8.76515 11.4793 9.08696C11.4184 9.14994 11.3669 9.20313 11.3295 9.24058C11.1007 9.46937 9.63912 8.22168 9.20588 7.78845L7.60102 9.39838C8.10053 8.89635 9.2057 7.78701 9.2057 7.78701C8.77247 7.35377 7.53081 5.89935 7.7596 5.67056C7.79705 5.63311 7.85024 5.58164 7.91322 5.5207C8.23503 5.20928 8.81255 4.65041 8.85256 4.45033C8.98024 3.81178 8.72528 2.26311 8.23236 1.75727C7.48681 0.992193 5.03342 0.897765 4.41201 1.90767Z" fill="white"/>
-</svg>
--- a/react/features/base/icons/svg/user.svg
+++ b/react/features/base/icons/svg/user.svg
@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M16.5 6.75C16.5 9.23528 14.4853 11.25 12 11.25C9.51472 11.25 7.5 9.23528 7.5 6.75C7.5 4.26472 9.51472 2.25 12 2.25C14.4853 2.25 16.5 4.26472 16.5 6.75ZM15 6.75C15 8.40685 13.6569 9.75 12 9.75C10.3431 9.75 9 8.40685 9 6.75C9 5.09315 10.3431 3.75 12 3.75C13.6569 3.75 15 5.09315 15 6.75Z" fill="white"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M19.5 17.25C19.5 19.7353 16.1421 21.75 12 21.75C7.85786 21.75 4.5 19.7353 4.5 17.25C4.5 14.7647 7.85786 12.75 12 12.75C16.1421 12.75 19.5 14.7647 19.5 17.25ZM18 17.25C18 17.7588 17.6485 18.4756 16.5316 19.1457C15.4445 19.798 13.8459 20.25 12 20.25C10.1541 20.25 8.55549 19.798 7.46844 19.1457C6.35154 18.4756 6 17.7588 6 17.25C6 16.7412 6.35154 16.0244 7.46844 15.3543C8.55549 14.702 10.1541 14.25 12 14.25C13.8459 14.25 15.4445 14.702 16.5316 15.3543C17.6485 16.0244 18 16.7412 18 17.25Z" fill="white"/>
-</svg>
--- a/react/features/base/label/components/web/Label.tsx
+++ b/react/features/base/label/components/web/Label.tsx
@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React from 'react';
 import { makeStyles } from 'tss-react/mui';

 import Icon from '../../../icons/components/Icon';
@ -92,27 +92,13 @@ const Label = ({
 }: IProps) => {
    const { classes, cx } = useStyles();

-    const onKeyPress = useCallback(event => {
-        if (!onClick) {
-            return;
-        }
-
-        if (event.key === 'Enter' || event.key === ' ') {
-            event.preventDefault();
-            onClick();
-        }
-    }, [ onClick ]);
-
    return (
        <div
            className = { cx(classes.label, onClick && classes.clickable,
                color && classes[color], className
            ) }
            id = { id }
-            onClick = { onClick }
-            onKeyPress = { onKeyPress }
-            role = { onClick ? 'button' : undefined }
-            tabIndex = { onClick ? 0 : undefined }>
+            onClick = { onClick }>
            {icon && <Icon
                color = { iconColor }
                size = '16'
--- a/react/features/base/lastn/middleware.ts
+++ b/react/features/base/lastn/middleware.ts
@ -88,11 +88,7 @@ const _updateLastN = debounce(({ dispatch, getState }: IStore) => {
        lastNSelected = 1;
    }

-    const { lastN } = state['features/base/lastn'];
-
-    if (lastN !== lastNSelected) {
-        dispatch(setLastN(lastNSelected));
-    }
+    dispatch(setLastN(lastNSelected));
 }, 1000); /* Don't send this more often than once a second. */


--- a/react/features/base/lib-jitsi-meet/functions.any.ts
+++ b/react/features/base/lib-jitsi-meet/functions.any.ts
@ -1,12 +1,9 @@
-/* eslint-disable lines-around-comment */
-
 import { IStateful } from '../app/types';
 import { toState } from '../redux/functions';

 // @ts-ignore
 import JitsiMeetJS from './_';

-
 const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
 const JitsiConnectionErrors = JitsiMeetJS.errors.connection;

--- a/react/features/base/media/components/Video.web.js
+++ b/react/features/base/media/components/Video.web.js
@ -1,4 +1,5 @@
-// @ts-ignore
+// @flow
+
 import Video from './web/Video';

 export default Video;
--- a/react/features/base/media/constants.ts
+++ b/react/features/base/media/constants.ts
@ -15,15 +15,11 @@ export type MediaType = 'audio' | 'video' | 'screenshare';
 *
 * @enum {string}
 */
-export const MEDIA_TYPE: {
-    AUDIO: MediaType;
-    SCREENSHARE: MediaType;
-    VIDEO: MediaType;
- } = {
-     AUDIO: 'audio',
-     SCREENSHARE: 'screenshare',
-     VIDEO: 'video'
- };
+export const MEDIA_TYPE: { [key: string]: MediaType; } = {
+    AUDIO: 'audio',
+    SCREENSHARE: 'screenshare',
+    VIDEO: 'video'
+};


 /* eslint-disable no-bitwise */
--- a/react/features/base/participants/functions.ts
+++ b/react/features/base/participants/functions.ts
@ -601,7 +601,7 @@ export function getDominantSpeakerParticipant(stateful: IStateful) {
 export function isEveryoneModerator(stateful: IStateful) {
    const state = toState(stateful)['features/base/participants'];

-    return state.numberOfNonModeratorParticipants === 0;
+    return state.everyoneIsModerator === true;
 }

 /**
--- a/react/features/base/participants/middleware.ts
+++ b/react/features/base/participants/middleware.ts
@ -429,12 +429,11 @@ StateListenerRegistry.register(
                'e2ee.enabled': (participant: IJitsiParticipant, value: string) =>
                    _e2eeUpdated(store, conference, participant.getId(), value),
                'features_e2ee': (participant: IJitsiParticipant, value: boolean) =>
-                    getParticipantById(store.getState(), participant.getId())?.e2eeSupported !== value
-                        && store.dispatch(participantUpdated({
-                            conference,
-                            id: participant.getId(),
-                            e2eeSupported: value
-                        })),
+                    store.dispatch(participantUpdated({
+                        conference,
+                        id: participant.getId(),
+                        e2eeSupported: value
+                    })),
                'features_jigasi': (participant: IJitsiParticipant, value: boolean) =>
                    store.dispatch(participantUpdated({
                        conference,
@ -507,12 +506,7 @@ StateListenerRegistry.register(
 function _e2eeUpdated({ getState, dispatch }: IStore, conference: IJitsiConference,
        participantId: string, newValue: string | boolean) {
    const e2eeEnabled = newValue === 'true';
-    const state = getState();
-    const { e2ee = {} } = state['features/base/config'];
-
-    if (e2eeEnabled === getParticipantById(state, participantId)?.e2eeEnabled) {
-        return;
-    }
+    const { e2ee = {} } = getState()['features/base/config'];

    dispatch(participantUpdated({
        conference,
@ -647,6 +641,7 @@ function _participantJoinedOrUpdated(store: IStore, next: Function, action: any)
    // Send an external update of the local participant's raised hand state
    // if a new raised hand state is defined in the action.
    if (typeof raisedHandTimestamp !== 'undefined') {
+
        if (local) {
            const { conference } = getState()['features/base/conference'];
            const rHand = parseInt(raisedHandTimestamp, 10);
@ -696,6 +691,14 @@ function _participantJoinedOrUpdated(store: IStore, next: Function, action: any)
        }
    }

+    // Notify external listeners of potential avatarURL changes.
+    if (typeof APP === 'object') {
+        const currentKnownId = local ? APP.conference.getMyUserId() : id;
+
+        // Force update of local video getting a new id.
+        APP.UI.refreshAvatarDisplay(currentKnownId);
+    }
+
    return result;
 }

--- a/react/features/base/participants/reducer.ts
+++ b/react/features/base/participants/reducer.ts
@ -63,12 +63,10 @@ const PARTICIPANT_PROPS_TO_OMIT_WHEN_UPDATE = [

 const DEFAULT_STATE = {
    dominantSpeaker: undefined,
+    everyoneIsModerator: false,
    fakeParticipants: new Map(),
    local: undefined,
    localScreenShare: undefined,
-    numberOfNonModeratorParticipants: 0,
-    numberOfParticipantsDisabledE2EE: 0,
-    numberOfParticipantsNotSupportingE2EE: 0,
    overwrittenNameList: {},
    pinnedParticipant: undefined,
    raisedHandsQueue: [],
@ -81,12 +79,10 @@ const DEFAULT_STATE = {

 export interface IParticipantsState {
    dominantSpeaker?: string;
+    everyoneIsModerator: boolean;
    fakeParticipants: Map<string, IParticipant>;
    local?: ILocalParticipant;
    localScreenShare?: IParticipant;
-    numberOfNonModeratorParticipants: number;
-    numberOfParticipantsDisabledE2EE: number;
-    numberOfParticipantsNotSupportingE2EE: number;
    overwrittenNameList: { [id: string]: string; };
    pinnedParticipant?: string;
    raisedHandsQueue: Array<{ id: string; raisedHandTimestamp: number; }>;
@ -204,30 +200,23 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
        }

        let newParticipant: IParticipant | null = null;
-        const oldParticipant = local || state.local?.id === id ? state.local : state.remote.get(id);

        if (state.remote.has(id)) {
-            newParticipant = _participant(oldParticipant, action);
+            newParticipant = _participant(state.remote.get(id), action);
            state.remote.set(id, newParticipant);
        } else if (id === state.local?.id) {
            newParticipant = state.local = _participant(state.local, action);
        }

-        if (oldParticipant && newParticipant && !newParticipant.fakeParticipant) {
+        if (newParticipant) {
+
+            // everyoneIsModerator calculation:
            const isModerator = isParticipantModerator(newParticipant);

-            if (isParticipantModerator(oldParticipant) !== isModerator) {
-                state.numberOfNonModeratorParticipants += isModerator ? -1 : 1;
-            }
-
-            const e2eeEnabled = Boolean(newParticipant.e2eeEnabled);
-            const e2eeSupported = Boolean(newParticipant.e2eeSupported);
-
-            if (Boolean(oldParticipant.e2eeEnabled) !== e2eeEnabled) {
-                state.numberOfParticipantsDisabledE2EE += e2eeEnabled ? -1 : 1;
-            }
-            if (!local && Boolean(oldParticipant.e2eeSupported) !== e2eeSupported) {
-                state.numberOfParticipantsNotSupportingE2EE += e2eeSupported ? -1 : 1;
+            if (state.everyoneIsModerator && !isModerator) {
+                state.everyoneIsModerator = false;
+            } else if (!state.everyoneIsModerator && isModerator) {
+                state.everyoneIsModerator = _isEveryoneModerator(state);
            }
        }

@ -278,22 +267,13 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
            state.dominantSpeaker = id;
        }

-        if (!fakeParticipant) {
-            const isModerator = isParticipantModerator(participant);
+        const isModerator = isParticipantModerator(participant);
+        const { local, remote } = state;

-            if (!isModerator) {
-                state.numberOfNonModeratorParticipants += 1;
-            }
-
-            const { e2eeEnabled, e2eeSupported } = participant as IParticipant;
-
-            if (!e2eeEnabled) {
-                state.numberOfParticipantsDisabledE2EE += 1;
-            }
-
-            if (!participant.local && !e2eeSupported) {
-                state.numberOfParticipantsNotSupportingE2EE += 1;
-            }
+        if (state.everyoneIsModerator && !isModerator) {
+            state.everyoneIsModerator = false;
+        } else if (!local && remote.size === 0 && isModerator) {
+            state.everyoneIsModerator = true;
        }

        if (participant.local) {
@ -369,7 +349,6 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
            pinnedParticipant
        } = state;
        let oldParticipant = remote.get(id);
-        let isLocalScreenShare = false;

        if (oldParticipant?.sources?.size) {
            const videoSources: Map<string, ISourceInfo> | undefined = oldParticipant.sources.get(MEDIA_TYPE.VIDEO);
@ -394,7 +373,6 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
            oldParticipant = state.local;
            delete state.local;
        } else if (localScreenShare?.id === id) {
-            isLocalScreenShare = true;
            oldParticipant = state.local;
            delete state.localScreenShare;
        } else {
@ -405,6 +383,10 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
        state.sortedRemoteParticipants.delete(id);
        state.raisedHandsQueue = state.raisedHandsQueue.filter(pid => pid.id !== id);

+        if (!state.everyoneIsModerator && !isParticipantModerator(oldParticipant)) {
+            state.everyoneIsModerator = _isEveryoneModerator(state);
+        }
+
        if (dominantSpeaker === id) {
            state.dominantSpeaker = undefined;
        }
@ -425,22 +407,6 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
            state.sortedRemoteVirtualScreenshareParticipants = new Map(sortedRemoteVirtualScreenshareParticipants);
        }

-        if (oldParticipant && !oldParticipant.fakeParticipant && !isLocalScreenShare) {
-            const { e2eeEnabled, e2eeSupported } = oldParticipant;
-
-            if (!isParticipantModerator(oldParticipant)) {
-                state.numberOfNonModeratorParticipants -= 1;
-            }
-
-            if (!e2eeEnabled) {
-                state.numberOfParticipantsDisabledE2EE -= 1;
-            }
-
-            if (!oldParticipant.local && !e2eeSupported) {
-                state.numberOfParticipantsNotSupportingE2EE -= 1;
-            }
-        }
-
        return { ...state };
    }
    case PARTICIPANT_SOURCES_UPDATED: {
@ -499,6 +465,27 @@ function _getDisplayName(state: Object, name?: string): string {
    return name ?? (config?.defaultRemoteDisplayName || 'Fellow Jitster');
 }

+/**
+ * Loops through the participants in the state in order to check if all participants are moderators.
+ *
+ * @param {Object} state - The local participant redux state.
+ * @returns {boolean}
+ */
+function _isEveryoneModerator(state: IParticipantsState) {
+    if (isParticipantModerator(state.local)) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        for (const [ k, p ] of state.remote) {
+            if (!isParticipantModerator(p)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
 /**
 * Reducer function for a single participant.
 *
--- a/react/features/base/popover/components/Popover.web.tsx
+++ b/react/features/base/popover/components/Popover.web.tsx
@ -1,5 +1,4 @@
 import React, { Component, ReactNode } from 'react';
-import ReactFocusLock from 'react-focus-lock';

 import { IReduxState } from '../../../app/types';
 import DialogPortal from '../../../toolbox/components/web/DialogPortal';
@ -35,18 +34,6 @@ interface IProps {
     */
    disablePopover?: boolean;

-    /**
-     * The id of the dom element acting as the Popover label (matches aria-labelledby).
-     */
-    headingId?: string;
-
-    /**
-     * String acting as the Popover label (matches aria-label).
-     *
-     * If headingId is set, this will not be used.
-     */
-    headingLabel?: string;
-
    /**
     * An id attribute to apply to the root of the {@code Popover}
     * component.
@ -199,16 +186,7 @@ class Popover extends Component<IProps, IState> {
     * @returns {ReactElement}
     */
    render() {
-        const { children,
-            className,
-            content,
-            headingId,
-            headingLabel,
-            id,
-            overflowDrawer,
-            visible,
-            trigger
-        } = this.props;
+        const { children, className, content, id, overflowDrawer, visible, trigger } = this.props;

        if (overflowDrawer) {
            return (
@ -219,7 +197,6 @@ class Popover extends Component<IProps, IState> {
                    { children }
                    <JitsiPortal>
                        <Drawer
-                            headingId = { headingId }
                            isOpen = { visible }
                            onClose = { this._onHideDialog }>
                            { content }
@ -237,8 +214,7 @@ class Popover extends Component<IProps, IState> {
                onKeyPress = { this._onKeyPress }
                { ...(trigger === 'hover' ? {
                    onMouseEnter: this._onShowDialog,
-                    onMouseLeave: this._onHideDialog,
-                    tabIndex: 0
+                    onMouseLeave: this._onHideDialog
                } : {}) }
                ref = { this._containerRef }>
                { visible && (
@ -246,16 +222,7 @@ class Popover extends Component<IProps, IState> {
                        getRef = { this._setContextMenuRef }
                        setSize = { this._setContextMenuStyle }
                        style = { this.state.contextMenuStyle }>
-                        <ReactFocusLock
-                            lockProps = {{
-                                role: 'dialog',
-                                'aria-modal': true,
-                                'aria-labelledby': headingId,
-                                'aria-label': !headingId && headingLabel ? headingLabel : undefined
-                            }}
-                            returnFocus = { true }>
-                            {this._renderContent()}
-                        </ReactFocusLock>
+                        {this._renderContent()}
                    </DialogPortal>
                )}
                { children }
--- a/react/features/base/premeeting/components/web/InputField.js
+++ b/react/features/base/premeeting/components/web/InputField.js
@ -0,0 +1,210 @@
+// @flow
+
+import React, { PureComponent } from 'react';
+
+import { getFieldValue } from '../../../react';
+
+type Props = {
+
+    /**
+     * If the input should be focused on display.
+     */
+    autoFocus?: boolean,
+
+    /**
+     * Class name to be appended to the default class list.
+     */
+    className?: string,
+
+    /**
+     * TestId of the button. Can be used to locate element when testing UI.
+     */
+    testId?: string,
+
+    /**
+     * Callback for the onChange event of the field.
+     */
+    onChange: Function,
+
+    /**
+     * Callback to be used when the user hits Enter in the field.
+     */
+    onSubmit?: Function,
+
+    /**
+     * Placeholder text for the field.
+     */
+    placeHolder: string,
+
+    /**
+     * Whether the input is read only or not.
+     */
+    readOnly?: boolean,
+
+    /**
+     * The field type (e.g. Text, password...etc).
+     */
+    type: string,
+
+    /**
+     * Externally provided value.
+     */
+    value?: string,
+    id?: string,
+    autoComplete?: string
+};
+
+type State = {
+
+    /**
+     * True if the field is focused, false otherwise.
+     */
+    focused: boolean,
+
+    /**
+     * The current value of the field.
+     */
+    value: string
+}
+
+/**
+ * Implements a pre-styled input field to be used on pre-meeting screens.
+ */
+export default class InputField extends PureComponent<Props, State> {
+    static defaultProps: {
+        className: '',
+        type: 'text'
+    };
+
+    /**
+     * Instantiates a new component.
+     *
+     * @inheritdoc
+     */
+    constructor(props: Props) {
+        super(props);
+
+        this.state = {
+            focused: false,
+            value: props.value || ''
+        };
+
+        this._onBlur = this._onBlur.bind(this);
+        this._onChange = this._onChange.bind(this);
+        this._onFocus = this._onFocus.bind(this);
+        this._onKeyDown = this._onKeyDown.bind(this);
+    }
+
+    /**
+     * Implements {@code PureComponent.getDerivedStateFromProps}.
+     *
+     * @inheritdoc
+     */
+    static getDerivedStateFromProps(props: Props, state: State) {
+        const { value } = props;
+
+        if (state.value !== value) {
+            return {
+                ...state,
+                value
+            };
+        }
+
+        return null;
+    }
+
+    /**
+     * Implements {@code PureComponent#render}.
+     *
+     * @inheritdoc
+     */
+    render() {
+        return (
+            <input
+                autoComplete = { this.props.autoComplete }
+                autoFocus = { this.props.autoFocus }
+                className = { `field ${this.state.focused ? 'focused' : ''} ${this.props.className || ''}` }
+                data-testid = { this.props.testId ? this.props.testId : undefined }
+                id = { this.props.id }
+                onBlur = { this._onBlur }
+                onChange = { this._onChange }
+                onFocus = { this._onFocus }
+                onKeyDown = { this._onKeyDown }
+                onKeyPress = { this._onKeyPress }
+                placeholder = { this.props.placeHolder }
+                readOnly = { this.props.readOnly }
+                type = { this.props.type }
+                value = { this.state.value } />
+        );
+    }
+
+    _onBlur: () => void;
+
+    /**
+     * Callback for the onBlur event of the field.
+     *
+     * @returns {void}
+     */
+    _onBlur() {
+        this.setState({
+            focused: false
+        });
+    }
+
+    _onChange: Object => void;
+
+    /**
+     * Callback for the onChange event of the field.
+     *
+     * @param {Object} evt - The static event.
+     * @returns {void}
+     */
+    _onChange(evt) {
+        const value = getFieldValue(evt);
+
+        this.setState({
+            value
+        });
+
+        const { onChange } = this.props;
+
+        onChange && onChange(value);
+    }
+
+    _onFocus: () => void;
+
+    /**
+     * Callback for the onFocus event of the field.
+     *
+     * @returns {void}
+     */
+    _onFocus() {
+        this.setState({
+            focused: true
+        });
+    }
+
+    _onKeyDown: Object => void;
+
+    /**
+     * Joins the conference on 'Enter'.
+     *
+     * @param {Event} event - Key down event object.
+     * @returns {void}
+     */
+    _onKeyDown(event) {
+        const { onSubmit } = this.props;
+
+        onSubmit && event.key === 'Enter' && onSubmit();
+    }
+
+    /**
+     * Stop event propagation on key press.
+     *
+     * @param {Event} event - Key press event object.
+     * @returns {void}
+     */
+    _onKeyPress(event) {
+        event.stopPropagation();
+    }
+}
--- a/react/features/base/premeeting/components/web/index.js
+++ b/react/features/base/premeeting/components/web/index.js
@ -1,4 +1,5 @@
 // @flow

 export { default as ActionButton } from './ActionButton';
+export { default as InputField } from './InputField';
 export { default as PreMeetingScreen } from './PreMeetingScreen';
--- a/react/features/base/react/components/web/MeetingsList.js
+++ b/react/features/base/react/components/web/MeetingsList.js
@ -105,14 +105,18 @@ class MeetingsList extends Component<Props> {
     * @returns {React.ReactNode}
     */
    render() {
-        const { listEmptyComponent, meetings } = this.props;
+        const { listEmptyComponent, meetings, t } = this.props;

        /**
         * If there are no recent meetings we don't want to display anything.
         */
        if (meetings) {
            return (
-                <Container className = 'meetings-list'>
+                <Container
+                    aria-label = { t('welcomepage.recentList') }
+                    className = 'meetings-list'
+                    role = 'menu'
+                    tabIndex = '-1'>
                    {
                        meetings.length === 0
                            ? listEmptyComponent
@ -234,16 +238,23 @@ class MeetingsList extends Component<Props> {

        return (
            <Container
+                aria-label = { title }
                className = { rootClassName }
                key = { index }
-                onClick = { onPress }>
+                onClick = { onPress }
+                onKeyPress = { onKeyPress }
+                role = 'menuitem'
+                tabIndex = { 0 }>
+                <Container className = 'left-column'>
+                    <Text className = 'title'>
+                        { _toDateString(date) }
+                    </Text>
+                    <Text className = 'subtitle'>
+                        { _toTimeString(time) }
+                    </Text>
+                </Container>
                <Container className = 'right-column'>
-                    <Text
-                        className = 'title'
-                        onClick = { onPress }
-                        onKeyPress = { onKeyPress }
-                        role = 'button'
-                        tabIndex = { 0 }>
+                    <Text className = 'title'>
                        { title }
                    </Text>
                    {
@ -259,14 +270,6 @@ class MeetingsList extends Component<Props> {
                            </Text>) : null
                    }
                </Container>
-                <Container className = 'left-column'>
-                    <Text className = 'title'>
-                        { _toDateString(date) }
-                    </Text>
-                    <Text className = 'subtitle'>
-                        { _toTimeString(time) }
-                    </Text>
-                </Container>
                <Container className = 'actions'>
                    { elementAfter || null }

--- a/react/features/base/settings/functions.any.ts
+++ b/react/features/base/settings/functions.any.ts
@ -1,5 +1,4 @@
 import { IReduxState } from '../../app/types';
-import { iAmVisitor } from '../../visitors/functions';
 import { IStateful } from '../app/types';
 import CONFIG_WHITELIST from '../config/configWhitelist';
 import { IConfigState } from '../config/reducer';
@ -115,12 +114,11 @@ export function shouldHideShareAudioHelper(state: IReduxState): boolean | undefi
 }

 /**
- * Gets the disabled self view setting.
+ * Gets the disable self view setting.
 *
 * @param {Object} state - Redux state.
 * @returns {boolean}
 */
 export function getHideSelfView(state: IReduxState) {
-    return state['features/base/config'].disableSelfView || state['features/base/settings'].disableSelfView
-        || iAmVisitor(state);
+    return state['features/base/config'].disableSelfView || state['features/base/settings'].disableSelfView;
 }
--- a/react/features/base/toolbox/components/ToolboxItem.web.js
+++ b/react/features/base/toolbox/components/ToolboxItem.web.js
@ -84,7 +84,7 @@ export default class ToolboxItem extends AbstractToolboxItem<Props> {
            onKeyDown: disabled ? undefined : onKeyDown,
            onKeyPress: this._onKeyPress,
            tabIndex: 0,
-            role: 'button'
+            role: showLabel ? 'menuitem' : 'button'
        };

        const elementType = showLabel ? 'li' : 'div';
--- a/react/features/base/toolbox/components/web/OverflowMenuItem.js
+++ b/react/features/base/toolbox/components/web/OverflowMenuItem.js
@ -123,7 +123,7 @@ class OverflowMenuItem extends Component<Props> {
                className = { className }
                onClick = { disabled ? null : onClick }
                onKeyPress = { this._onKeyPress }
-                role = 'button'
+                role = 'menuitem'
                tabIndex = { 0 }>
                <span className = 'overflow-menu-item-icon'>
                    <Icon
--- a/react/features/base/toolbox/components/web/ToolboxButtonWithIconPopup.js
+++ b/react/features/base/toolbox/components/web/ToolboxButtonWithIconPopup.js
@ -121,7 +121,6 @@ export default function ToolboxButtonWithIconPopup(props: Props) {
            <div className = 'settings-button-small-icon-container'>
                <Popover
                    content = { popoverContent }
-                    headingLabel = { ariaLabel }
                    onPopoverClose = { onPopoverClose }
                    onPopoverOpen = { onPopoverOpen }
                    position = 'top'
--- a/Show More
+++ b/Show More