@webex/plugin-meetings 3.0.0-beta.146 → 3.0.0-beta.148

package/dist/meeting/index.js

@@ -17,12 +17,10 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports.default = exports.MEDIA_UPDATE_TYPE = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
 var _values = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/values"));
-var _assign = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/assign"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
@@ -34,7 +32,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs2/he
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
 var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
 var _defer2 = _interopRequireDefault(require("lodash/defer"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _pick2 = _interopRequireDefault(require("lodash/pick"));
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
@@ -71,7 +68,6 @@ var _reconnectionInProgress = _interopRequireDefault(require("../common/errors/r
 var _constants = require("../constants");
 var _constants2 = _interopRequireDefault(require("../metrics/constants"));
 var _parameter = _interopRequireDefault(require("../common/errors/parameter"));
-var _media2 = _interopRequireDefault(require("../common/errors/media"));
 var _meetingInfoV = require("../meeting-info/meeting-info-v2");
 var _browserDetection = _interopRequireDefault(require("../common/browser-detection"));
 var _receiveSlotManager = require("../multistream/receiveSlotManager");
@@ -107,11 +103,9 @@ var logRequest = function logRequest(request, _ref) {
   });
 };
 var MEDIA_UPDATE_TYPE = {
-  ALL: 'ALL',
-  AUDIO: 'AUDIO',
-  VIDEO: 'VIDEO',
-  SHARE: 'SHARE',
-  LAMBDA: 'LAMBDA'
+  TRANSCODED_MEDIA_CONNECTION: 'TRANSCODED_MEDIA_CONNECTION',
+  LAMBDA: 'LAMBDA',
+  UPDATE_MEDIA: 'UPDATE_MEDIA'
 };
 
 /**
@@ -126,16 +120,6 @@ var MEDIA_UPDATE_TYPE = {
  * @property {boolean} isSharing
  */
 
-/**
- * AudioVideo
- * @typedef {Object} AudioVideo
- * @property {Object} audio
- * @property {String} audio.deviceId
- * @property {Object} video
- * @property {String} video.deviceId
- * @property {String} video.localVideoQuality // [240p, 360p, 480p, 720p, 1080p]
- */
-
 /**
  * SharePreferences
  * @typedef {Object} SharePreferences
@@ -150,21 +134,12 @@ var MEDIA_UPDATE_TYPE = {
  * @property {String} [pin]
  * @property {Boolean} [moderator]
  * @property {String|Object} [meetingQuality]
- * @property {String} [meetingQuality.local]
  * @property {String} [meetingQuality.remote]
  * @property {Boolean} [rejoin]
  * @property {Boolean} [enableMultistream]
  * @property {String} [correlationId]
  */
 
-/**
- * SendOptions
- * @typedef {Object} SendOptions
- * @property {Boolean} sendAudio
- * @property {Boolean} sendVideo
- * @property {Boolean} sendShare
- */
-
 /**
  * Recording
  * @typedef {Object} Recording
@@ -515,6 +490,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "localAudioTrackMuteStateHandler", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "localVideoTrackMuteStateHandler", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "underlyingLocalTrackChangeHandler", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "roles", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "environment", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "namespace", _constants.MEETINGS);
@@ -544,98 +520,6 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           break;
       }
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getMediaStreams", function (mediaDirection) {
-      var audioVideo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _constants.VIDEO_RESOLUTIONS[_this.mediaProperties.localQualityLevel];
-      var sharePreferences = arguments.length > 2 ? arguments[2] : undefined;
-      if (mediaDirection && (mediaDirection.sendAudio || mediaDirection.sendVideo || mediaDirection.sendShare)) {
-        if (mediaDirection && mediaDirection.sendAudio && mediaDirection.sendVideo && mediaDirection.sendShare && isBrowser('safari')) {
-          _loggerProxy.default.logger.warn('Meeting:index#getMediaStreams --> Setting `sendShare` to FALSE, due to complications with Safari');
-          mediaDirection.sendShare = false;
-          _loggerProxy.default.logger.warn('Meeting:index#getMediaStreams --> Enabling `sendShare` along with `sendAudio` & `sendVideo`, on Safari, causes a failure while setting up a screen share at the same time as the camera+mic stream');
-          _loggerProxy.default.logger.warn('Meeting:index#getMediaStreams --> Please use `meeting.shareScreen()` to manually start the screen share after successfully joining the meeting');
-        }
-        if (audioVideo && (0, _isString2.default)(audioVideo)) {
-          if ((0, _keys.default)(_constants.VIDEO_RESOLUTIONS).includes(audioVideo)) {
-            _this.mediaProperties.setLocalQualityLevel(audioVideo);
-            audioVideo = {
-              video: _constants.VIDEO_RESOLUTIONS[audioVideo].video
-            };
-          } else {
-            throw new _parameter.default("".concat(audioVideo, " not supported. Either pass level from pre-defined resolutions or pass complete audioVideo object"));
-          }
-        }
-        if (!audioVideo.video) {
-          audioVideo = _objectSpread(_objectSpread({}, audioVideo), {}, {
-            video: _objectSpread(_objectSpread({}, audioVideo.video), _constants.VIDEO_RESOLUTIONS[_this.mediaProperties.localQualityLevel].video)
-          });
-        }
-        // extract deviceId if exists otherwise default to null.
-        var _ref2 = audioVideo && audioVideo.video || {
-            deviceId: null
-          },
-          preferredVideoDevice = _ref2.deviceId;
-        var lastVideoDeviceId = _this.mediaProperties.getVideoDeviceId();
-        if (preferredVideoDevice) {
-          // Store new preferred video input device
-          _this.mediaProperties.setVideoDeviceId(preferredVideoDevice);
-        } else if (lastVideoDeviceId) {
-          // no new video preference specified so use last stored value,
-          // works with empty object {} or media constraint.
-          // eslint-disable-next-line no-param-reassign
-          audioVideo = _objectSpread(_objectSpread({}, audioVideo), {}, {
-            video: _objectSpread(_objectSpread({}, audioVideo.video), {}, {
-              deviceId: lastVideoDeviceId
-            })
-          });
-        }
-        return _media.default.getSupportedDevice({
-          sendAudio: mediaDirection.sendAudio,
-          sendVideo: mediaDirection.sendVideo
-        }).catch(function (error) {
-          return _promise.default.reject(new _media2.default('Given constraints do not match permission set for either camera or microphone', error));
-        }).then(function (devicePermissions) {
-          return _media.default.getUserMedia(_objectSpread(_objectSpread({}, mediaDirection), {}, {
-            sendAudio: devicePermissions.sendAudio,
-            sendVideo: devicePermissions.sendVideo,
-            isSharing: _this.shareStatus === _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE
-          }), audioVideo, sharePreferences,
-          // @ts-ignore - config coming from registerPlugin
-          _this.config).catch(function (error) {
-            var _this$locusUrl;
-            // Whenever there is a failure when trying to access a user's device
-            // report it as an Behavioral metric
-            // This gives visibility into common errors and can help
-            // with further troubleshooting
-            var metricName = _constants2.default.GET_USER_MEDIA_FAILURE;
-            var data = {
-              correlation_id: _this.correlationId,
-              locus_id: (_this$locusUrl = _this.locusUrl) === null || _this$locusUrl === void 0 ? void 0 : _this$locusUrl.split('/').pop(),
-              reason: error.message,
-              stack: error.stack
-            };
-            var metadata = {
-              type: error.name
-            };
-            _metrics.default.sendBehavioralMetric(metricName, data, metadata);
-            throw new _media2.default('Unable to retrieve media streams', error);
-          });
-        });
-      }
-      return _promise.default.reject(new _media2.default('At least one of the mediaDirection value should be true'));
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getSupportedDevices", function (_ref3) {
-      var _ref3$sendAudio = _ref3.sendAudio,
-        sendAudio = _ref3$sendAudio === void 0 ? true : _ref3$sendAudio,
-        _ref3$sendVideo = _ref3.sendVideo,
-        sendVideo = _ref3$sendVideo === void 0 ? true : _ref3$sendVideo;
-      return _media.default.getSupportedDevice({
-        sendAudio: sendAudio,
-        sendVideo: sendVideo
-      });
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getDevices", function () {
-      return _media.default.getDevices();
-    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleRoapFailure", function (error) {
       // eslint-disable-next-line @typescript-eslint/no-shadow
       var sendBehavioralMetric = function sendBehavioralMetric(metricName, error, correlationId) {
@@ -990,30 +874,27 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           mediaUpdateType = _this$queuedMediaUpda.mediaUpdateType,
           _options2 = _this$queuedMediaUpda.options;
         _loggerProxy.default.logger.log("Meeting:index#processNextQueuedMediaUpdate --> performing delayed media update type=".concat(mediaUpdateType));
+        var mediaUpdate = _promise.default.resolve();
         switch (mediaUpdateType) {
-          case MEDIA_UPDATE_TYPE.ALL:
-            _this.updateMedia(_options2).then(pendingPromiseResolve, pendingPromiseReject);
-            break;
-          case MEDIA_UPDATE_TYPE.AUDIO:
-            _this.updateAudio(_options2).then(pendingPromiseResolve, pendingPromiseReject);
-            break;
-          case MEDIA_UPDATE_TYPE.VIDEO:
-            _this.updateVideo(_options2).then(pendingPromiseResolve, pendingPromiseReject);
-            break;
-          case MEDIA_UPDATE_TYPE.SHARE:
-            _this.updateShare(_options2).then(pendingPromiseResolve, pendingPromiseReject);
+          case MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION:
+            mediaUpdate = _this.updateTranscodedMediaConnection();
             break;
           case MEDIA_UPDATE_TYPE.LAMBDA:
-            _options2.lambda().then(pendingPromiseResolve, pendingPromiseReject);
+            mediaUpdate = _options2.lambda();
+            break;
+          case MEDIA_UPDATE_TYPE.UPDATE_MEDIA:
+            mediaUpdate = _this.updateMedia(_options2);
             break;
           default:
             _loggerProxy.default.logger.error("Peer-connection-manager:index#processNextQueuedMediaUpdate --> unsupported media update type ".concat(mediaUpdateType, " found in the queue"));
             break;
         }
+        mediaUpdate.then(pendingPromiseResolve, pendingPromiseReject).then(function () {
+          return _this.processNextQueuedMediaUpdate();
+        });
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleShareTrackEnded", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _this$mediaProperties;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -1024,57 +905,31 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
             _this.leave({
               reason: _constants.MEETING_REMOVED_REASON.USER_ENDED_SHARE_STREAMS
             });
-            _context.next = 22;
+            _context.next = 12;
             break;
           case 4:
-            if (!_this.isMultistream) {
-              _context.next = 21;
-              break;
-            }
-            _context.prev = 5;
-            if (!_this.mediaProperties.mediaDirection.sendShare) {
-              _context.next = 9;
-              break;
-            }
-            _context.next = 9;
-            return _this.releaseScreenShareFloor();
-          case 9:
-            _context.next = 14;
+            _context.prev = 4;
+            _context.next = 7;
+            return _this.unpublishTracks([_this.mediaProperties.shareTrack]);
+          case 7:
+            _context.next = 12;
             break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](5);
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](4);
             _loggerProxy.default.logger.log('Meeting:index#handleShareTrackEnded --> Error stopping share: ', _context.t0);
-          case 14:
-            _context.prev = 14;
-            // todo: once SPARK-399695 is done, we will be able to just call this.setLocalShareTrack(null); here instead of the next 2 lines:
-            (_this$mediaProperties = _this.mediaProperties.shareTrack) === null || _this$mediaProperties === void 0 ? void 0 : _this$mediaProperties.off(_mediaHelpers.LocalTrackEvents.Ended, _this.handleShareTrackEnded);
-            _this.mediaProperties.setLocalShareTrack(null);
-            _this.mediaProperties.mediaDirection.sendShare = false;
-            return _context.finish(14);
-          case 19:
-            _context.next = 22;
-            break;
-          case 21:
-            // Skip checking for a stable peerConnection
-            // to allow immediately stopping screenshare
-            _this.stopShare({
-              skipSignalingCheck: true
-            }).catch(function (error) {
-              _loggerProxy.default.logger.log('Meeting:index#handleShareTrackEnded --> Error stopping share: ', error);
-            });
-          case 22:
+          case 12:
             _triggerProxy.default.trigger((0, _assertThisInitialized2.default)(_this), {
               file: 'meeting/index',
               function: 'handleShareTrackEnded'
             }, _constants.EVENT_TRIGGERS.MEETING_STOPPED_SHARING_LOCAL, {
-              type: _constants.EVENT_TYPES.LOCAL_SHARE
+              reason: _constants.SHARE_STOPPED_REASON.TRACK_ENDED
             });
-          case 23:
+          case 13:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 11, 14, 19]]);
+      }, _callee, null, [[4, 9]]);
     })));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clearMeetingData", function () {
       _this.audio = null;
@@ -1221,8 +1076,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      * helper class for managing receive slots (for multistream media connections)
      */
     _this.receiveSlotManager = new _receiveSlotManager.ReceiveSlotManager(function (mediaType) {
-      var _this$mediaProperties2;
-      if (!((_this$mediaProperties2 = _this.mediaProperties) !== null && _this$mediaProperties2 !== void 0 && _this$mediaProperties2.webrtcMediaConnection)) {
+      var _this$mediaProperties;
+      if (!((_this$mediaProperties = _this.mediaProperties) !== null && _this$mediaProperties !== void 0 && _this$mediaProperties.webrtcMediaConnection)) {
         return _promise.default.reject(new Error('Webrtc media connection is missing'));
       }
       return _this.mediaProperties.webrtcMediaConnection.createReceiveSlot(mediaType);
@@ -1327,7 +1182,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      */
     _this.reconnectionManager = new _reconnectionManager.default((0, _assertThisInitialized2.default)(_this));
     /**
-     * created later
+     * created with media connection
      * @instance
      * @type {MuteState}
      * @private
@@ -1335,7 +1190,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      */
     _this.audio = null;
     /**
-     * created later
+     * created with media connection
      * @instance
      * @type {MuteState}
      * @private
@@ -1744,6 +1599,16 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     _this.localVideoTrackMuteStateHandler = function (event) {
       _this.video.handleLocalTrackMuteStateChange((0, _assertThisInitialized2.default)(_this), event.trackState.muted);
     };
+
+    // The handling of underlying track changes should be done inside
+    // @webex/internal-media-core, but for now we have to do it here, because
+    // RoapMediaConnection has to use raw MediaStreamTracks in its API until
+    // the Calling SDK also moves to using webrtc-core tracks
+    _this.underlyingLocalTrackChangeHandler = function () {
+      if (!_this.isMultistream) {
+        _this.updateTranscodedMediaConnection();
+      }
+    };
     return _this;
   }
 
@@ -1759,12 +1624,12 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   (0, _createClass2.default)(Meeting, [{
     key: "fetchMeetingInfo",
     value: function () {
-      var _fetchMeetingInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref5) {
-        var _ref5$password, password, _ref5$captchaCode, captchaCode, _ref5$extraParams, extraParams, captchaInfo, info, _err$body, _err$body2;
+      var _fetchMeetingInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref3) {
+        var _ref3$password, password, _ref3$captchaCode, captchaCode, _ref3$extraParams, extraParams, captchaInfo, info, _err$body, _err$body2;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref5$password = _ref5.password, password = _ref5$password === void 0 ? null : _ref5$password, _ref5$captchaCode = _ref5.captchaCode, captchaCode = _ref5$captchaCode === void 0 ? null : _ref5$captchaCode, _ref5$extraParams = _ref5.extraParams, extraParams = _ref5$extraParams === void 0 ? {} : _ref5$extraParams;
+              _ref3$password = _ref3.password, password = _ref3$password === void 0 ? null : _ref3$password, _ref3$captchaCode = _ref3.captchaCode, captchaCode = _ref3$captchaCode === void 0 ? null : _ref3$captchaCode, _ref3$extraParams = _ref3.extraParams, extraParams = _ref3$extraParams === void 0 ? {} : _ref3$extraParams;
               // when fetch meeting info is called directly by the client, we want to clear out the random timer for sdk to do it
               if (this.fetchMeetingInfoTimeoutId) {
                 clearTimeout(this.fetchMeetingInfoTimeoutId);
@@ -2335,11 +2200,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         _this8.pstnUpdate(payload);
 
         // If user moved to a JOINED state and there is a pending floor grant trigger it
-        if (_this8.floorGrantPending && payload.newSelf.state === _constants.MEETING_STATE.STATES.JOINED) {
-          _this8.requestScreenShareFloor().then(function () {
-            _this8.floorGrantPending = false;
-          });
-        }
+        _this8.requestScreenShareFloorIfPending();
       });
     }
 
@@ -2453,10 +2314,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "setupLocusControlsListener",
     value: function setupLocusControlsListener() {
       var _this12 = this;
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_RECORDING_UPDATED, function (_ref6) {
-        var state = _ref6.state,
-          modifiedBy = _ref6.modifiedBy,
-          lastModified = _ref6.lastModified;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_RECORDING_UPDATED, function (_ref4) {
+        var state = _ref4.state,
+          modifiedBy = _ref4.modifiedBy,
+          lastModified = _ref4.lastModified;
         var event;
         switch (state) {
           case _constants.RECORDING_STATE.RECORDING:
@@ -2487,8 +2348,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           function: 'setupLocusControlsListener'
         }, event, _this12.recording);
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MEETING_CONTAINER_UPDATED, function (_ref7) {
-        var meetingContainerUrl = _ref7.meetingContainerUrl;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MEETING_CONTAINER_UPDATED, function (_ref5) {
+        var meetingContainerUrl = _ref5.meetingContainerUrl;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2496,9 +2357,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           meetingContainerUrl: meetingContainerUrl
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIBE_UPDATED, function (_ref8) {
-        var caption = _ref8.caption,
-          transcribing = _ref8.transcribing;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIBE_UPDATED, function (_ref6) {
+        var caption = _ref6.caption,
+          transcribing = _ref6.transcribing;
         // @ts-ignore - config coming from registerPlugin
         if (transcribing && _this12.transcription && _this12.config.receiveTranscription) {
           _this12.receiveTranscription();
@@ -2512,16 +2373,16 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           });
         }
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MEETING_BREAKOUT_UPDATED, function (_ref9) {
-        var breakout = _ref9.breakout;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MEETING_BREAKOUT_UPDATED, function (_ref7) {
+        var breakout = _ref7.breakout;
         _this12.breakouts.updateBreakout(breakout);
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
         }, _constants.EVENT_TRIGGERS.MEETING_BREAKOUTS_UPDATE);
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_JOIN_BREAKOUT_FROM_MAIN, function (_ref10) {
-        var mainLocusUrl = _ref10.mainLocusUrl;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_JOIN_BREAKOUT_FROM_MAIN, function (_ref8) {
+        var mainLocusUrl = _ref8.mainLocusUrl;
         _this12.meetingRequest.getLocusStatusByUrl(mainLocusUrl).catch(function (error) {
           // clear main session cache when attendee join into breakout and forbidden to get locus from main locus url,
           // which means main session is not active for the attendee
@@ -2530,8 +2391,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           }
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_ENTRY_EXIT_TONE_UPDATED, function (_ref11) {
-        var entryExitTone = _ref11.entryExitTone;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_ENTRY_EXIT_TONE_UPDATED, function (_ref9) {
+        var entryExitTone = _ref9.entryExitTone;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2539,8 +2400,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           entryExitTone: entryExitTone
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MUTE_ON_ENTRY_CHANGED, function (_ref12) {
-        var state = _ref12.state;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_MUTE_ON_ENTRY_CHANGED, function (_ref10) {
+        var state = _ref10.state;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2548,8 +2409,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           state: state
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_SHARE_CONTROL_CHANGED, function (_ref13) {
-        var state = _ref13.state;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_SHARE_CONTROL_CHANGED, function (_ref11) {
+        var state = _ref11.state;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2557,8 +2418,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           state: state
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_DISALLOW_UNMUTE_CHANGED, function (_ref14) {
-        var state = _ref14.state;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_DISALLOW_UNMUTE_CHANGED, function (_ref12) {
+        var state = _ref12.state;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2566,8 +2427,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           state: state
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_REACTIONS_CHANGED, function (_ref15) {
-        var state = _ref15.state;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_REACTIONS_CHANGED, function (_ref13) {
+        var state = _ref13.state;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2575,8 +2436,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           state: state
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_VIEW_THE_PARTICIPANTS_LIST_CHANGED, function (_ref16) {
-        var state = _ref16.state;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_VIEW_THE_PARTICIPANTS_LIST_CHANGED, function (_ref14) {
+        var state = _ref14.state;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2584,8 +2445,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           state: state
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_RAISE_HAND_CHANGED, function (_ref17) {
-        var state = _ref17.state;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_RAISE_HAND_CHANGED, function (_ref15) {
+        var state = _ref15.state;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2593,8 +2454,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           state: state
         });
       });
-      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_VIDEO_CHANGED, function (_ref18) {
-        var state = _ref18.state;
+      this.locusInfo.on(_constants.LOCUSINFO.EVENTS.CONTROLS_VIDEO_CHANGED, function (_ref16) {
+        var state = _ref16.state;
         _triggerProxy.default.trigger(_this12, {
           file: 'meeting/index',
           function: 'setupLocusControlsListener'
@@ -2604,6 +2465,23 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       });
     }
 
+    /**
+     * Trigger annotation info update event
+     @returns {undefined}
+     @param {object} contentShare
+     @param {object} previousContentShare
+     */
+  }, {
+    key: "triggerAnnotationInfoEvent",
+    value: function triggerAnnotationInfoEvent(contentShare, previousContentShare) {
+      if (contentShare !== null && contentShare !== void 0 && contentShare.annotation && !(0, _isEqual2.default)(contentShare === null || contentShare === void 0 ? void 0 : contentShare.annotation, previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.annotation)) {
+        _triggerProxy.default.trigger(this, {
+          file: 'meeting/index',
+          function: 'triggerAnnotationInfoEvent'
+        }, _constants.EVENT_TRIGGERS.MEETING_UPDATE_ANNOTATION_INFO, contentShare.annotation);
+      }
+    }
+
     /**
      * Set up the locus info media shares listener
      * update content and whiteboard sharing id value for members, and updates the member
@@ -2618,21 +2496,16 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       var _this13 = this;
       // Will get triggered on local and remote share
       this.locusInfo.on(_constants.EVENTS.LOCUS_INFO_UPDATE_MEDIA_SHARES, /*#__PURE__*/function () {
-        var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(payload) {
+        var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(payload) {
           var _payload$previous, _payload$previous2;
-          var _payload$current, contentShare, whiteboardShare, previousContentShare, previousWhiteboardShare, newShareStatus, _this13$mediaProperti, localShareTrack, oldShareStatus, sendStartedSharingRemote, _this13$mediaProperti2;
+          var _payload$current, contentShare, whiteboardShare, previousContentShare, previousWhiteboardShare, newShareStatus, oldShareStatus, sendStartedSharingRemote, _this13$mediaProperti;
           return _regenerator.default.wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
                 _payload$current = payload.current, contentShare = _payload$current.content, whiteboardShare = _payload$current.whiteboard;
                 previousContentShare = (_payload$previous = payload.previous) === null || _payload$previous === void 0 ? void 0 : _payload$previous.content;
                 previousWhiteboardShare = (_payload$previous2 = payload.previous) === null || _payload$previous2 === void 0 ? void 0 : _payload$previous2.whiteboard;
-                if (!(0, _isEqual2.default)(contentShare === null || contentShare === void 0 ? void 0 : contentShare.annotation, previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.annotation)) {
-                  _triggerProxy.default.trigger(_this13, {
-                    file: 'meetings/index',
-                    function: 'remoteShare'
-                  }, _constants.EVENT_TRIGGERS.MEETING_UPDATE_ANNOTATION_INFO, contentShare.annotation);
-                }
+                _this13.triggerAnnotationInfoEvent(contentShare, previousContentShare);
                 if (!(contentShare.beneficiaryId === (previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.beneficiaryId) && contentShare.disposition === (previousContentShare === null || previousContentShare === void 0 ? void 0 : previousContentShare.disposition) && whiteboardShare.beneficiaryId === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.beneficiaryId) && whiteboardShare.disposition === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.disposition) && whiteboardShare.resourceUrl === (previousWhiteboardShare === null || previousWhiteboardShare === void 0 ? void 0 : previousWhiteboardShare.resourceUrl))) {
                   _context3.next = 6;
                   break;
@@ -2640,58 +2513,19 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 return _context3.abrupt("return");
               case 6:
                 newShareStatus = _this13.shareStatus; // REMOTE - check if remote started sharing
-                if (!(_this13.selfId !== contentShare.beneficiaryId && contentShare.disposition === _constants.FLOOR_ACTION.GRANTED)) {
-                  _context3.next = 11;
-                  break;
-                }
-                // CONTENT - sharing content remote
-                newShareStatus = _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE;
-                _context3.next = 33;
-                break;
-              case 11:
-                if (!(_this13.selfId === contentShare.beneficiaryId && contentShare.disposition === _constants.FLOOR_ACTION.GRANTED)) {
-                  _context3.next = 32;
-                  break;
-                }
-                // @ts-ignore originalTrack is private - this will be fixed when SPARK-399695 is done
-                localShareTrack = (_this13$mediaProperti = _this13.mediaProperties.shareTrack) === null || _this13$mediaProperti === void 0 ? void 0 : _this13$mediaProperti.originalTrack; // todo: remove this block of code and instead make sure we have LocalTrackEvents.Ended listener always registered (SPARK-399695)
-                if (!((localShareTrack === null || localShareTrack === void 0 ? void 0 : localShareTrack.readyState) === 'ended')) {
-                  _context3.next = 29;
-                  break;
+                if (_this13.selfId !== contentShare.beneficiaryId && contentShare.disposition === _constants.FLOOR_ACTION.GRANTED) {
+                  // CONTENT - sharing content remote
+                  newShareStatus = _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE;
                 }
-                _context3.prev = 14;
-                if (!_this13.isMultistream) {
-                  _context3.next = 20;
-                  break;
+                // LOCAL - check if we started sharing content
+                else if (_this13.selfId === contentShare.beneficiaryId && contentShare.disposition === _constants.FLOOR_ACTION.GRANTED) {
+                  // CONTENT - sharing content local
+                  newShareStatus = _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE;
                 }
-                _context3.next = 18;
-                return _this13.unpublishTracks([_this13.mediaProperties.shareTrack]);
-              case 18:
-                _context3.next = 22;
-                break;
-              case 20:
-                _context3.next = 22;
-                return _this13.stopShare({
-                  skipSignalingCheck: true
-                });
-              case 22:
-                _context3.next = 27;
-                break;
-              case 24:
-                _context3.prev = 24;
-                _context3.t0 = _context3["catch"](14);
-                _loggerProxy.default.logger.log('Meeting:index#setUpLocusMediaSharesListener --> Error stopping share: ', _context3.t0);
-              case 27:
-                _context3.next = 30;
-                break;
-              case 29:
-                // CONTENT - sharing content local
-                newShareStatus = _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE;
-              case 30:
-                _context3.next = 33;
-                break;
-              case 32:
-                if (whiteboardShare.disposition === _constants.FLOOR_ACTION.GRANTED) {
+                // If we did not hit the cases above, no one is sharng content, so we check if we are sharing whiteboard
+                // There is no concept of local/remote share for whiteboard
+                // It does not matter who requested to share the whiteboard, everyone gets the same view
+                else if (whiteboardShare.disposition === _constants.FLOOR_ACTION.GRANTED) {
                   // WHITEBOARD - sharing whiteboard
                   newShareStatus = _constants.SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE;
                 }
@@ -2699,47 +2533,46 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 else if ((previousContentShare && contentShare.disposition === _constants.FLOOR_ACTION.RELEASED || contentShare.disposition === null) && (previousWhiteboardShare && whiteboardShare.disposition === _constants.FLOOR_ACTION.RELEASED || whiteboardShare.disposition === null)) {
                   newShareStatus = _constants.SHARE_STATUS.NO_SHARE;
                 }
-              case 33:
                 if (!(newShareStatus !== _this13.shareStatus)) {
-                  _context3.next = 75;
+                  _context3.next = 45;
                   break;
                 }
                 oldShareStatus = _this13.shareStatus; // update our state before we send out any notifications
                 _this13.shareStatus = newShareStatus;
 
                 // send out "stop" notifications for the old state
-                _context3.t1 = oldShareStatus;
-                _context3.next = _context3.t1 === _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE ? 39 : _context3.t1 === _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE ? 41 : _context3.t1 === _constants.SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE ? 43 : _context3.t1 === _constants.SHARE_STATUS.NO_SHARE ? 45 : 46;
+                _context3.t0 = oldShareStatus;
+                _context3.next = _context3.t0 === _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE ? 14 : _context3.t0 === _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE ? 16 : _context3.t0 === _constants.SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE ? 18 : _context3.t0 === _constants.SHARE_STATUS.NO_SHARE ? 20 : 21;
                 break;
-              case 39:
+              case 14:
                 _triggerProxy.default.trigger(_this13, {
                   file: 'meetings/index',
                   function: 'remoteShare'
                 }, _constants.EVENT_TRIGGERS.MEETING_STOPPED_SHARING_REMOTE);
-                return _context3.abrupt("break", 47);
-              case 41:
+                return _context3.abrupt("break", 22);
+              case 16:
                 _triggerProxy.default.trigger(_this13, {
                   file: 'meeting/index',
                   function: 'localShare'
                 }, _constants.EVENT_TRIGGERS.MEETING_STOPPED_SHARING_LOCAL, {
                   reason: _constants.SHARE_STOPPED_REASON.SELF_STOPPED
                 });
-                return _context3.abrupt("break", 47);
-              case 43:
+                return _context3.abrupt("break", 22);
+              case 18:
                 _triggerProxy.default.trigger(_this13, {
                   file: 'meeting/index',
                   function: 'stopWhiteboardShare'
                 }, _constants.EVENT_TRIGGERS.MEETING_STOPPED_SHARING_WHITEBOARD);
-                return _context3.abrupt("break", 47);
-              case 45:
-                return _context3.abrupt("break", 47);
-              case 46:
-                return _context3.abrupt("break", 47);
-              case 47:
-                _context3.t2 = newShareStatus;
-                _context3.next = _context3.t2 === _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE ? 50 : _context3.t2 === _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE ? 64 : _context3.t2 === _constants.SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE ? 67 : _context3.t2 === _constants.SHARE_STATUS.NO_SHARE ? 70 : 71;
+                return _context3.abrupt("break", 22);
+              case 20:
+                return _context3.abrupt("break", 22);
+              case 21:
+                return _context3.abrupt("break", 22);
+              case 22:
+                _context3.t1 = newShareStatus;
+                _context3.next = _context3.t1 === _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE ? 25 : _context3.t1 === _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE ? 34 : _context3.t1 === _constants.SHARE_STATUS.WHITEBOARD_SHARE_ACTIVE ? 37 : _context3.t1 === _constants.SHARE_STATUS.NO_SHARE ? 40 : 41;
                 break;
-              case 50:
+              case 25:
                 sendStartedSharingRemote = function sendStartedSharingRemote() {
                   _triggerProxy.default.trigger(_this13, {
                     file: 'meetings/index',
@@ -2750,33 +2583,20 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                     shareInstanceId: contentShare.shareInstanceId
                   });
                 };
-                _context3.prev = 51;
-                if (!((_this13$mediaProperti2 = _this13.mediaProperties.mediaDirection) !== null && _this13$mediaProperti2 !== void 0 && _this13$mediaProperti2.sendShare && oldShareStatus === _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE)) {
-                  _context3.next = 60;
+                _context3.prev = 26;
+                if (!((_this13$mediaProperti = _this13.mediaProperties.mediaDirection) !== null && _this13$mediaProperti !== void 0 && _this13$mediaProperti.sendShare && oldShareStatus === _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE)) {
+                  _context3.next = 30;
                   break;
                 }
-                if (!_this13.isMultistream) {
-                  _context3.next = 58;
-                  break;
-                }
-                _context3.next = 56;
+                _context3.next = 30;
                 return _this13.unpublishTracks([_this13.mediaProperties.shareTrack]);
-              case 56:
-                _context3.next = 60;
-                break;
-              case 58:
-                _context3.next = 60;
-                return _this13.updateShare({
-                  sendShare: false,
-                  receiveShare: _this13.mediaProperties.mediaDirection.receiveShare
-                });
-              case 60:
-                _context3.prev = 60;
+              case 30:
+                _context3.prev = 30;
                 sendStartedSharingRemote();
-                return _context3.finish(60);
-              case 63:
-                return _context3.abrupt("break", 72);
-              case 64:
+                return _context3.finish(30);
+              case 33:
+                return _context3.abrupt("break", 42);
+              case 34:
                 _triggerProxy.default.trigger(_this13, {
                   file: 'meeting/index',
                   function: 'share'
@@ -2785,8 +2605,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   event: _config.eventType.LOCAL_SHARE_FLOOR_GRANTED,
                   meeting: _this13
                 });
-                return _context3.abrupt("break", 72);
-              case 67:
+                return _context3.abrupt("break", 42);
+              case 37:
                 _triggerProxy.default.trigger(_this13, {
                   file: 'meeting/index',
                   function: 'startWhiteboardShare'
@@ -2798,16 +2618,16 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   event: _config.eventType.WHITEBOARD_SHARE_FLOOR_GRANTED,
                   meeting: _this13
                 });
-                return _context3.abrupt("break", 72);
-              case 70:
-                return _context3.abrupt("break", 72);
-              case 71:
-                return _context3.abrupt("break", 72);
-              case 72:
+                return _context3.abrupt("break", 42);
+              case 40:
+                return _context3.abrupt("break", 42);
+              case 41:
+                return _context3.abrupt("break", 42);
+              case 42:
                 _this13.members.locusMediaSharesUpdate(payload);
-                _context3.next = 76;
+                _context3.next = 46;
                 break;
-              case 75:
+              case 45:
                 if (newShareStatus === _constants.SHARE_STATUS.REMOTE_SHARE_ACTIVE) {
                   // if we got here, then some remote participant has stolen
                   // the presentation from another remote participant
@@ -2836,14 +2656,14 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   });
                   _this13.members.locusMediaSharesUpdate(payload);
                 }
-              case 76:
+              case 46:
               case "end":
                 return _context3.stop();
             }
-          }, _callee3, null, [[14, 24], [51,, 60, 63]]);
+          }, _callee3, null, [[26,, 30, 33]]);
         }));
         return function (_x2) {
-          return _ref19.apply(this, arguments);
+          return _ref17.apply(this, arguments);
         };
       }());
     }
@@ -3286,46 +3106,63 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           });
         }
       });
-      this.locusInfo.on(_constants.EVENTS.DESTROY_MEETING, function (payload) {
-        // if self state is NOT left
-
-        // TODO: Handle sharing and wireless sharing when meeting end
-        if (_this20.wirelessShare) {
-          if (_this20.mediaProperties.shareTrack) {
-            _this20.setLocalShareTrack(null);
-          }
-        }
-        // when multiple WEB deviceType join with same user
-        // and some of the devices are joined and some are left
-        // when your own device is still connected you want to leave and destroy
-        // else you want to just destroy
-        // this looks odd because when it leaves it should destroy, but we get a
-        // leave response and we should destroy it on the next event loop
-        // the leave response gets parsed and we decide if we want to destroy the meeting
-        // the first time we just leave it, the second time it comes it destroys it from the collection
-        if (payload.shouldLeave) {
-          // TODO:  We should do cleaning of meeting object if the shouldLeave: false because there might be meeting object which we are not cleaning
-
-          _this20.leave({
-            reason: payload.reason
-          }).then(function () {
-            _loggerProxy.default.logger.warn('Meeting:index#setUpLocusInfoMeetingListener --> DESTROY_MEETING. The meeting has been left, but has not been destroyed, you should see a later event for leave.');
-          }).catch(function (error) {
-            // @ts-ignore
-            _loggerProxy.default.logger.error("Meeting:index#setUpLocusInfoMeetingListener --> DESTROY_MEETING. Issue with leave for meeting, meeting still in collection: ".concat(_this20, ", error: ").concat(error));
-          });
-        } else {
-          _loggerProxy.default.logger.info('Meeting:index#setUpLocusInfoMeetingListener --> MEETING_REMOVED_REASON', payload.reason);
-          _util.default.cleanUp(_this20);
-          _triggerProxy.default.trigger(_this20, {
-            file: 'meeting/index',
-            function: 'setUpLocusInfoMeetingListener'
-          }, _constants.EVENTS.DESTROY_MEETING, {
-            reason: payload.reason,
-            meetingId: _this20.id
-          });
-        }
-      });
+      this.locusInfo.on(_constants.EVENTS.DESTROY_MEETING, /*#__PURE__*/function () {
+        var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(payload) {
+          return _regenerator.default.wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
+              case 0:
+                if (!_this20.wirelessShare) {
+                  _context4.next = 4;
+                  break;
+                }
+                if (!_this20.mediaProperties.shareTrack) {
+                  _context4.next = 4;
+                  break;
+                }
+                _context4.next = 4;
+                return _this20.setLocalShareTrack(undefined);
+              case 4:
+                if (!payload.shouldLeave) {
+                  _context4.next = 16;
+                  break;
+                }
+                _context4.prev = 5;
+                _context4.next = 8;
+                return _this20.leave({
+                  reason: payload.reason
+                });
+              case 8:
+                _loggerProxy.default.logger.warn('Meeting:index#setUpLocusInfoMeetingListener --> DESTROY_MEETING. The meeting has been left, but has not been destroyed, you should see a later event for leave.');
+                _context4.next = 14;
+                break;
+              case 11:
+                _context4.prev = 11;
+                _context4.t0 = _context4["catch"](5);
+                // @ts-ignore
+                _loggerProxy.default.logger.error("Meeting:index#setUpLocusInfoMeetingListener --> DESTROY_MEETING. Issue with leave for meeting, meeting still in collection: ".concat(_this20, ", error: ").concat(_context4.t0));
+              case 14:
+                _context4.next = 19;
+                break;
+              case 16:
+                _loggerProxy.default.logger.info('Meeting:index#setUpLocusInfoMeetingListener --> MEETING_REMOVED_REASON', payload.reason);
+                _util.default.cleanUp(_this20);
+                _triggerProxy.default.trigger(_this20, {
+                  file: 'meeting/index',
+                  function: 'setUpLocusInfoMeetingListener'
+                }, _constants.EVENTS.DESTROY_MEETING, {
+                  reason: payload.reason,
+                  meetingId: _this20.id
+                });
+              case 19:
+              case "end":
+                return _context4.stop();
+            }
+          }, _callee4, null, [[5, 11]]);
+        }));
+        return function (_x3) {
+          return _ref18.apply(this, arguments);
+        };
+      }());
     }
 
     /**
@@ -3469,78 +3306,6 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       return this.members;
     }
 
-    /**
-     * Truthy when a meeting has an audio connection established
-     * @returns {Boolean}  true if meeting audio is connected otherwise false
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "isAudioConnected",
-    value: function isAudioConnected() {
-      return !!this.audio;
-    }
-
-    /**
-     * Convenience function to tell whether a meeting is muted
-     * @returns {Boolean} if meeting audio muted or not
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "isAudioMuted",
-    value: function isAudioMuted() {
-      return this.audio && this.audio.isMuted();
-    }
-
-    /**
-     * Convenience function to tell if the end user last changed the audio state
-     * @returns {Boolean} if audio was manipulated by the end user
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "isAudioSelf",
-    value: function isAudioSelf() {
-      return this.audio && this.audio.isSelf();
-    }
-
-    /**
-     * Truthy when a meeting has a video connection established
-     * @returns {Boolean} true if meeting video connected otherwise false
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "isVideoConnected",
-    value: function isVideoConnected() {
-      return !!this.video;
-    }
-
-    /**
-     * Convenience function to tell whether video is muted
-     * @returns {Boolean} if meeting video is muted or not
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "isVideoMuted",
-    value: function isVideoMuted() {
-      return this.video && this.video.isMuted();
-    }
-
-    /**
-     * Convenience function to tell whether the end user changed the video state
-     * @returns {Boolean} if meeting video is muted or not
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "isVideoSelf",
-    value: function isVideoSelf() {
-      return this.video && this.video.isSelf();
-    }
-
     /**
      * Sets the meeting info on the class instance
      * @param {Object} meetingInfo
@@ -3649,21 +3414,6 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       _triggerProxy.default.trigger(this, options, _constants.EVENTS.REQUEST_UPLOAD_LOGS, this);
     }
 
-    /**
-     * Removes remote audio and video stream on the class instance and triggers an event
-     * to developers
-     * @returns {undefined}
-     * @public
-     * @memberof Meeting
-     * @deprecated after v1.89.3
-     */
-  }, {
-    key: "unsetRemoteStream",
-    value: function unsetRemoteStream() {
-      _loggerProxy.default.logger.warn('Meeting:index#unsetRemoteStream --> [DEPRECATION WARNING]: unsetRemoteStream has been deprecated after v1.89.3');
-      this.mediaProperties.unsetRemoteMedia();
-    }
-
     /**
      * Removes remote audio, video and share tracks from class instance's mediaProperties
      * @returns {undefined}
@@ -3699,10 +3449,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "closeRemoteTracks",
     value: function closeRemoteTracks() {
       var _this22 = this;
-      var _this$mediaProperties3 = this.mediaProperties,
-        remoteAudioTrack = _this$mediaProperties3.remoteAudioTrack,
-        remoteVideoTrack = _this$mediaProperties3.remoteVideoTrack,
-        remoteShare = _this$mediaProperties3.remoteShare;
+      var _this$mediaProperties2 = this.mediaProperties,
+        remoteAudioTrack = _this$mediaProperties2.remoteAudioTrack,
+        remoteVideoTrack = _this$mediaProperties2.remoteVideoTrack,
+        remoteShare = _this$mediaProperties2.remoteShare;
 
       /**
        * Triggers an event to the developer
@@ -3743,243 +3493,168 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     }
 
     /**
-     * Emits the 'media:ready' event with a local stream that consists of 1 local audio and 1 local video track
-     * @returns {undefined}
-     * @private
-     * @memberof Meeting
+     * Stores the reference to a new microphone track, sets up the required event listeners
+     * on it, cleans up previous track, etc.
+     *
+     * @param {LocalMicrophoneTrack | null} localTrack local microphone track
+     * @returns {Promise<void>}
      */
   }, {
-    key: "sendLocalMediaReadyEvent",
-    value: function sendLocalMediaReadyEvent() {
-      var _this$mediaProperties4, _this$mediaProperties5;
-      _triggerProxy.default.trigger(this, {
-        file: 'meeting/index',
-        function: 'sendLocalMediaReadyEvent'
-      }, _constants.EVENT_TRIGGERS.MEDIA_READY, {
-        type: _constants.EVENT_TYPES.LOCAL,
-        stream: _util4.default.createMediaStream([(_this$mediaProperties4 = this.mediaProperties.audioTrack) === null || _this$mediaProperties4 === void 0 ? void 0 : _this$mediaProperties4.underlyingTrack, (_this$mediaProperties5 = this.mediaProperties.videoTrack) === null || _this$mediaProperties5 === void 0 ? void 0 : _this$mediaProperties5.underlyingTrack])
-      });
-    }
+    key: "setLocalAudioTrack",
+    value: function () {
+      var _setLocalAudioTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(localTrack) {
+        var oldTrack;
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              oldTrack = this.mediaProperties.audioTrack;
+              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
+              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
 
+              // we don't update this.mediaProperties.mediaDirection.sendAudio, because we always keep it as true to avoid extra SDP exchanges
+              this.mediaProperties.setLocalAudioTrack(localTrack);
+              this.audio.handleLocalTrackChange(this);
+              localTrack === null || localTrack === void 0 ? void 0 : localTrack.on(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
+              localTrack === null || localTrack === void 0 ? void 0 : localTrack.on(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+              if (!(!this.isMultistream || !localTrack)) {
+                _context5.next = 10;
+                break;
+              }
+              _context5.next = 10;
+              return this.unpublishTrack(oldTrack);
+            case 10:
+              _context5.next = 12;
+              return this.publishTrack(this.mediaProperties.audioTrack);
+            case 12:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function setLocalAudioTrack(_x4) {
+        return _setLocalAudioTrack.apply(this, arguments);
+      }
+      return setLocalAudioTrack;
+    }()
     /**
-     * Sets the local audio track on the class and emits an event to the developer
-     * @param {MediaStreamTrack} rawAudioTrack
-     * @param {Boolean} emitEvent if true, a media ready event is emitted to the developer
-     * @returns {undefined}
-     * @private
-     * @memberof Meeting
+     * Stores the reference to a new camera track, sets up the required event listeners
+     * on it, cleans up previous track, etc.
+     *
+     * @param {LocalCameraTrack | null} localTrack local camera track
+     * @returns {Promise<void>}
      */
   }, {
-    key: "setLocalAudioTrack",
-    value: function setLocalAudioTrack(rawAudioTrack) {
-      var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      if (this.isMultistream) {
-        throw new Error('this method is only supposed to be used for transcoded meetings');
-      }
-      if (rawAudioTrack) {
-        var settings = rawAudioTrack.getSettings();
-        var localMicrophoneTrack = new _mediaHelpers.LocalMicrophoneTrack(_util4.default.createMediaStream([rawAudioTrack]));
-        this.mediaProperties.setMediaSettings('audio', {
-          echoCancellation: settings.echoCancellation,
-          noiseSuppression: settings.noiseSuppression
-        });
-        _loggerProxy.default.logger.log('Meeting:index#setLocalAudioTrack --> Audio settings.', (0, _stringify.default)(this.mediaProperties.mediaSettings.audio));
-        this.mediaProperties.setLocalAudioTrack(localMicrophoneTrack);
-        if (this.audio) this.audio.applyClientStateLocally(this);
-      } else {
-        this.mediaProperties.setLocalAudioTrack(null);
-      }
-      if (emitEvent) {
-        this.sendLocalMediaReadyEvent();
+    key: "setLocalVideoTrack",
+    value: function () {
+      var _setLocalVideoTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(localTrack) {
+        var oldTrack;
+        return _regenerator.default.wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              oldTrack = this.mediaProperties.videoTrack;
+              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
+              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+
+              // we don't update this.mediaProperties.mediaDirection.sendVideo, because we always keep it as true to avoid extra SDP exchanges
+              this.mediaProperties.setLocalVideoTrack(localTrack);
+              this.video.handleLocalTrackChange(this);
+              localTrack === null || localTrack === void 0 ? void 0 : localTrack.on(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
+              localTrack === null || localTrack === void 0 ? void 0 : localTrack.on(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+              if (!(!this.isMultistream || !localTrack)) {
+                _context6.next = 10;
+                break;
+              }
+              _context6.next = 10;
+              return this.unpublishTrack(oldTrack);
+            case 10:
+              _context6.next = 12;
+              return this.publishTrack(this.mediaProperties.videoTrack);
+            case 12:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function setLocalVideoTrack(_x5) {
+        return _setLocalVideoTrack.apply(this, arguments);
       }
-    }
-
+      return setLocalVideoTrack;
+    }()
     /**
-     * Sets the local video track on the class and emits an event to the developer
-     * @param {MediaStreamTrack} rawVideoTrack
-     * @param {Boolean} emitEvent if true, a media ready event is emitted to the developer
-     * @returns {undefined}
-     * @private
-     * @memberof Meeting
-     */
-  }, {
-    key: "setLocalVideoTrack",
-    value: function setLocalVideoTrack(rawVideoTrack) {
-      var emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      if (this.isMultistream) {
-        throw new Error('this method is only supposed to be used for transcoded meetings');
-      }
-      if (rawVideoTrack) {
-        var _rawVideoTrack$getSet = rawVideoTrack.getSettings(),
-          aspectRatio = _rawVideoTrack$getSet.aspectRatio,
-          frameRate = _rawVideoTrack$getSet.frameRate,
-          height = _rawVideoTrack$getSet.height,
-          width = _rawVideoTrack$getSet.width,
-          deviceId = _rawVideoTrack$getSet.deviceId;
-        var localQualityLevel = this.mediaProperties.localQualityLevel;
-        var localCameraTrack = new _mediaHelpers.LocalCameraTrack(_util4.default.createMediaStream([rawVideoTrack]));
-        if (Number(localQualityLevel.slice(0, -1)) > height) {
-          _loggerProxy.default.logger.warn("Meeting:index#setLocalVideoTrack --> Local video quality of ".concat(localQualityLevel, " not supported,\n         downscaling to highest possible resolution of ").concat(height, "p"));
-          this.mediaProperties.setLocalQualityLevel("".concat(height, "p"));
-        }
-        this.mediaProperties.setLocalVideoTrack(localCameraTrack);
-        if (this.video) this.video.applyClientStateLocally(this);
-        this.mediaProperties.setMediaSettings('video', {
-          aspectRatio: aspectRatio,
-          frameRate: frameRate,
-          height: height,
-          width: width
-        });
-        // store and save the selected video input device
-        if (deviceId) {
-          this.mediaProperties.setVideoDeviceId(deviceId);
-        }
-        _loggerProxy.default.logger.log('Meeting:index#setLocalVideoTrack --> Video settings.', (0, _stringify.default)(this.mediaProperties.mediaSettings.video));
-      } else {
-        this.mediaProperties.setLocalVideoTrack(null);
-      }
-      if (emitEvent) {
-        this.sendLocalMediaReadyEvent();
-      }
-    }
-
-    /**
-     * Sets the local media stream on the class and emits an event to the developer
-     * @param {Stream} localStream the local media stream
-     * @returns {undefined}
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "setLocalTracks",
-    value: function setLocalTracks(localStream) {
-      if (localStream) {
-        if (this.isMultistream) {
-          throw new Error('addMedia() and updateMedia() APIs are not supported with multistream, use publishTracks/unpublishTracks instead');
-        }
-        var _MeetingUtil$getTrack = _util.default.getTrack(localStream),
-          audioTrack = _MeetingUtil$getTrack.audioTrack,
-          videoTrack = _MeetingUtil$getTrack.videoTrack;
-        this.setLocalAudioTrack(audioTrack, false);
-        this.setLocalVideoTrack(videoTrack, false);
-        this.sendLocalMediaReadyEvent();
-      }
-    }
-
-    /**
-     * Sets the local media stream on the class and emits an event to the developer
-     * @param {MediaStreamTrack} rawLocalShareTrack the local share media track
-     * @returns {undefined}
-     * @public
-     * @memberof Meeting
+     * Stores the reference to a new screen share track, sets up the required event listeners
+     * on it, cleans up previous track, etc.
+     * It also sends the floor grant/release request.
+     *
+     * @param {LocalDisplayTrack | undefined} localDisplayTrack local camera track
+     * @returns {Promise<void>}
      */
   }, {
     key: "setLocalShareTrack",
-    value: function setLocalShareTrack(rawLocalShareTrack) {
-      if (rawLocalShareTrack) {
-        var settings = rawLocalShareTrack.getSettings();
-        var localDisplayTrack = new _mediaHelpers.LocalDisplayTrack(_util4.default.createMediaStream([rawLocalShareTrack]));
-        this.mediaProperties.setLocalShareTrack(localDisplayTrack);
-        this.mediaProperties.setMediaSettings('screen', {
-          aspectRatio: settings.aspectRatio,
-          frameRate: settings.frameRate,
-          height: settings.height,
-          width: settings.width,
-          // @ts-ignore
-          displaySurface: settings.displaySurface,
-          // @ts-ignore
-          cursor: settings.cursor
-        });
-        _loggerProxy.default.logger.log('Meeting:index#setLocalShareTrack --> Screen settings.', (0, _stringify.default)(this.mediaProperties.mediaSettings.screen));
-        localDisplayTrack.on(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
-        _triggerProxy.default.trigger(this, {
-          file: 'meeting/index',
-          function: 'setLocalShareTrack'
-        }, _constants.EVENT_TRIGGERS.MEDIA_READY, {
-          type: _constants.EVENT_TYPES.LOCAL_SHARE,
-          track: rawLocalShareTrack
-        });
-      } else if (this.mediaProperties.shareTrack) {
-        this.mediaProperties.shareTrack.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
-        this.mediaProperties.shareTrack.stop(); // todo: this line should be removed once SPARK-399695 is done
-        this.mediaProperties.setLocalShareTrack(null);
+    value: function () {
+      var _setLocalShareTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(localDisplayTrack) {
+        var oldTrack;
+        return _regenerator.default.wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              oldTrack = this.mediaProperties.shareTrack;
+              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
+              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+              this.mediaProperties.setLocalShareTrack(localDisplayTrack);
+              localDisplayTrack === null || localDisplayTrack === void 0 ? void 0 : localDisplayTrack.on(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
+              localDisplayTrack === null || localDisplayTrack === void 0 ? void 0 : localDisplayTrack.on(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+              this.mediaProperties.mediaDirection.sendShare = !!localDisplayTrack;
+              if (!(!this.isMultistream || !localDisplayTrack)) {
+                _context7.next = 10;
+                break;
+              }
+              _context7.next = 10;
+              return this.unpublishTrack(oldTrack);
+            case 10:
+              _context7.next = 12;
+              return this.publishTrack(this.mediaProperties.shareTrack);
+            case 12:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this);
+      }));
+      function setLocalShareTrack(_x6) {
+        return _setLocalShareTrack.apply(this, arguments);
       }
-    }
-
-    /**
-     * Closes the local stream from the class and emits an event to the developer
-     * @returns {undefined}
-     * @event media:stopped
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "closeLocalStream",
-    value: function closeLocalStream() {
-      var _this23 = this;
-      var _this$mediaProperties6 = this.mediaProperties,
-        audioTrack = _this$mediaProperties6.audioTrack,
-        videoTrack = _this$mediaProperties6.videoTrack;
-      return _media.default.stopTracks(audioTrack).then(function () {
-        return _media.default.stopTracks(videoTrack);
-      }).then(function () {
-        if (audioTrack || videoTrack) {
-          _triggerProxy.default.trigger(_this23, {
-            file: 'meeting/index',
-            function: 'closeLocalStream'
-          }, _constants.EVENT_TRIGGERS.MEDIA_STOPPED, {
-            type: _constants.EVENT_TYPES.LOCAL
-          });
-        }
-      });
-    }
-
-    /**
-     * Closes the local stream from the class and emits an event to the developer
-     * @returns {undefined}
-     * @event media:stopped
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "closeLocalShare",
-    value: function closeLocalShare() {
-      var _this24 = this;
-      var track = this.mediaProperties.shareTrack;
-      return _media.default.stopTracks(track).then(function () {
-        if (track) {
-          _triggerProxy.default.trigger(_this24, {
-            file: 'meeting/index',
-            function: 'closeLocalShare'
-          }, _constants.EVENT_TRIGGERS.MEDIA_STOPPED, {
-            type: _constants.EVENT_TYPES.LOCAL_SHARE
-          });
-        }
-      });
-    }
-
-    /**
-     * Removes the local stream from the class and emits an event to the developer
-     * @returns {undefined}
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "unsetLocalVideoTrack",
-    value: function unsetLocalVideoTrack() {
-      this.mediaProperties.unsetLocalVideoTrack();
-    }
-
+      return setLocalShareTrack;
+    }()
     /**
-     * Removes the local share from the class and emits an event to the developer
-     * @returns {undefined}
-     * @public
-     * @memberof Meeting
+     * Removes references to local tracks. This function should be called
+     * on cleanup when we leave the meeting etc.
+     *
+     * @internal
+     * @returns {void}
      */
   }, {
-    key: "unsetLocalShareTrack",
-    value: function unsetLocalShareTrack() {
-      this.mediaProperties.unsetLocalShareTrack();
+    key: "cleanupLocalTracks",
+    value: function cleanupLocalTracks() {
+      var _this$mediaProperties3 = this.mediaProperties,
+        audioTrack = _this$mediaProperties3.audioTrack,
+        videoTrack = _this$mediaProperties3.videoTrack,
+        shareTrack = _this$mediaProperties3.shareTrack;
+      audioTrack === null || audioTrack === void 0 ? void 0 : audioTrack.off(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
+      audioTrack === null || audioTrack === void 0 ? void 0 : audioTrack.off(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+      videoTrack === null || videoTrack === void 0 ? void 0 : videoTrack.off(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
+      videoTrack === null || videoTrack === void 0 ? void 0 : videoTrack.off(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+      shareTrack === null || shareTrack === void 0 ? void 0 : shareTrack.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
+      shareTrack === null || shareTrack === void 0 ? void 0 : shareTrack.off(_mediaHelpers.LocalTrackEvents.UnderlyingTrackChange, this.underlyingLocalTrackChangeHandler);
+      this.mediaProperties.setLocalAudioTrack(undefined);
+      this.mediaProperties.setLocalVideoTrack(undefined);
+      this.mediaProperties.setLocalShareTrack(undefined);
+      this.mediaProperties.mediaDirection.sendAudio = false;
+      this.mediaProperties.mediaDirection.sendVideo = false;
+      this.mediaProperties.mediaDirection.sendShare = false;
+
+      // WCME doesn't unpublish tracks when multistream connection is closed, so we do it here
+      // (we have to do it for transcoded meetings anyway, so we might as well do for multistream too)
+      audioTrack === null || audioTrack === void 0 ? void 0 : audioTrack.setPublished(false);
+      videoTrack === null || videoTrack === void 0 ? void 0 : videoTrack.setPublished(false);
+      shareTrack === null || shareTrack === void 0 ? void 0 : shareTrack.setPublished(false);
     }
 
     /**
@@ -3991,7 +3666,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "setMercuryListener",
     value: function setMercuryListener() {
-      var _this25 = this;
+      var _this23 = this;
       // Client will have a socket manager and handle reconnecting to mercury, when we reconnect to mercury
       // if the meeting has active peer connections, it should try to reconnect.
       // @ts-ignore
@@ -3999,16 +3674,16 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         _loggerProxy.default.logger.info('Meeting:index#setMercuryListener --> Web socket online');
 
         // Only send restore event when it was disconnected before and for connected later
-        if (!_this25.hasWebsocketConnected) {
+        if (!_this23.hasWebsocketConnected) {
           _metrics.default.postEvent({
             event: _config.eventType.MERCURY_CONNECTION_RESTORED,
-            meeting: _this25
+            meeting: _this23
           });
           _metrics.default.sendBehavioralMetric(_constants2.default.MERCURY_CONNECTION_RESTORED, {
-            correlation_id: _this25.correlationId
+            correlation_id: _this23.correlationId
           });
         }
-        _this25.hasWebsocketConnected = true;
+        _this23.hasWebsocketConnected = true;
       });
 
       // @ts-ignore
@@ -4016,10 +3691,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         _loggerProxy.default.logger.error('Meeting:index#setMercuryListener --> Web socket offline');
         _metrics.default.postEvent({
           event: _config.eventType.MERCURY_CONNECTION_LOST,
-          meeting: _this25
+          meeting: _this23
         });
         _metrics.default.sendBehavioralMetric(_constants2.default.MERCURY_CONNECTION_FAILURE, {
-          correlation_id: _this25.correlationId
+          correlation_id: _this23.correlationId
         });
       });
     }
@@ -4047,6 +3722,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         this.receiveSlotManager.reset();
         this.mediaProperties.webrtcMediaConnection.close();
       }
+      this.audio = null;
+      this.video = null;
       return _promise.default.resolve();
     }
 
@@ -4081,246 +3758,41 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       this.correlationId = id;
     }
 
-    /**
-     * Mute the audio for a meeting
-     * @returns {Promise} resolves the data from muting audio {mute, self} or rejects if there is no audio set
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "muteAudio",
-    value: function muteAudio() {
-      var _this26 = this;
-      if (!_util.default.isUserInJoinedState(this.locusInfo)) {
-        return _promise.default.reject(new _webexErrors.UserNotJoinedError());
-      }
-
-      // @ts-ignore
-      if (!this.mediaId) {
-        // Happens when addMedia and mute are triggered in succession
-        return _promise.default.reject(new _webexErrors.NoMediaEstablishedYetError());
-      }
-      if (!this.audio) {
-        return _promise.default.reject(new _parameter.default('no audio control associated to the meeting'));
-      }
-
-      // First, stop sending the local audio media
-      return logRequest(this.audio.handleClientRequest(this, true).then(function () {
-        _util.default.handleAudioLogging(_this26.mediaProperties.audioTrack);
-        _metrics.default.postEvent({
-          event: _config.eventType.MUTED,
-          meeting: _this26,
-          data: {
-            trigger: _config.trigger.USER_INTERACTION,
-            mediaType: _config.mediaType.AUDIO
-          }
-        });
-      }).catch(function (error) {
-        _metrics.default.sendBehavioralMetric(_constants2.default.MUTE_AUDIO_FAILURE, {
-          correlation_id: _this26.correlationId,
-          locus_id: _this26.locusUrl.split('/').pop(),
-          reason: error.message,
-          stack: error.stack
-        });
-        throw error;
-      }), {
-        logText: "Meeting:index#muteAudio --> correlationId=".concat(this.correlationId, " muting audio")
-      });
-    }
-
-    /**
-     * Unmute meeting audio
-     * @returns {Promise} resolves data from muting audio {mute, self} or rejects if there is no audio set
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "unmuteAudio",
-    value: function unmuteAudio() {
-      var _this27 = this;
-      if (!_util.default.isUserInJoinedState(this.locusInfo)) {
-        return _promise.default.reject(new _webexErrors.UserNotJoinedError());
-      }
-
-      // @ts-ignore
-      if (!this.mediaId) {
-        // Happens when addMedia and mute are triggered in succession
-        return _promise.default.reject(new _webexErrors.NoMediaEstablishedYetError());
-      }
-      if (!this.audio) {
-        return _promise.default.reject(new _parameter.default('no audio control associated to the meeting'));
-      }
-
-      // First, send the control to unmute the participant on the server
-      return logRequest(this.audio.handleClientRequest(this, false).then(function () {
-        _util.default.handleAudioLogging(_this27.mediaProperties.audioTrack);
-        _metrics.default.postEvent({
-          event: _config.eventType.UNMUTED,
-          meeting: _this27,
-          data: {
-            trigger: _config.trigger.USER_INTERACTION,
-            mediaType: _config.mediaType.AUDIO
-          }
-        });
-      }).catch(function (error) {
-        _metrics.default.sendBehavioralMetric(_constants2.default.UNMUTE_AUDIO_FAILURE, {
-          correlation_id: _this27.correlationId,
-          locus_id: _this27.locusUrl.split('/').pop(),
-          reason: error.message,
-          stack: error.stack
-        });
-        throw error;
-      }), {
-        logText: "Meeting:index#unmuteAudio --> correlationId=".concat(this.correlationId, " unmuting audio")
-      });
-    }
-
-    /**
-     * Mute the video for a meeting
-     * @returns {Promise} resolves data from muting video {mute, self} or rejects if there is no video set
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "muteVideo",
-    value: function muteVideo() {
-      var _this28 = this;
-      if (!_util.default.isUserInJoinedState(this.locusInfo)) {
-        return _promise.default.reject(new _webexErrors.UserNotJoinedError());
-      }
-
-      // @ts-ignore
-      if (!this.mediaId) {
-        // Happens when addMedia and mute are triggered in succession
-        return _promise.default.reject(new _webexErrors.NoMediaEstablishedYetError());
-      }
-      if (!this.video) {
-        return _promise.default.reject(new _parameter.default('no video control associated to the meeting'));
-      }
-      return logRequest(this.video.handleClientRequest(this, true).then(function () {
-        _util.default.handleVideoLogging(_this28.mediaProperties.videoTrack);
-        _metrics.default.postEvent({
-          event: _config.eventType.MUTED,
-          meeting: _this28,
-          data: {
-            trigger: _config.trigger.USER_INTERACTION,
-            mediaType: _config.mediaType.VIDEO
-          }
-        });
-      }).catch(function (error) {
-        _metrics.default.sendBehavioralMetric(_constants2.default.MUTE_VIDEO_FAILURE, {
-          correlation_id: _this28.correlationId,
-          locus_id: _this28.locusUrl.split('/').pop(),
-          reason: error.message,
-          stack: error.stack
-        });
-        throw error;
-      }), {
-        logText: "Meeting:index#muteVideo --> correlationId=".concat(this.correlationId, " muting video")
-      });
-    }
-
-    /**
-     * Unmute meeting video
-     * @returns {Promise} resolves data from muting video {mute, self} or rejects if there is no video set
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "unmuteVideo",
-    value: function unmuteVideo() {
-      var _this29 = this;
-      if (!_util.default.isUserInJoinedState(this.locusInfo)) {
-        return _promise.default.reject(new _webexErrors.UserNotJoinedError());
-      }
-
-      // @ts-ignore
-      if (!this.mediaId) {
-        // Happens when addMedia and mute are triggered in succession
-        return _promise.default.reject(new _webexErrors.NoMediaEstablishedYetError());
-      }
-      if (!this.video) {
-        return _promise.default.reject(new _parameter.default('no audio control associated to the meeting'));
-      }
-      return logRequest(this.video.handleClientRequest(this, false).then(function () {
-        _util.default.handleVideoLogging(_this29.mediaProperties.videoTrack);
-        _metrics.default.postEvent({
-          event: _config.eventType.UNMUTED,
-          meeting: _this29,
-          data: {
-            trigger: _config.trigger.USER_INTERACTION,
-            mediaType: _config.mediaType.VIDEO
-          }
-        });
-      }).catch(function (error) {
-        _metrics.default.sendBehavioralMetric(_constants2.default.UNMUTE_VIDEO_FAILURE, {
-          correlation_id: _this29.correlationId,
-          locus_id: _this29.locusUrl.split('/').pop(),
-          reason: error.message,
-          stack: error.stack
-        });
-        throw error;
-      }), {
-        logText: "Meeting:index#unmuteVideo --> correlationId=".concat(this.correlationId, " unmuting video")
-      });
-    }
-
     /**
      * Shorthand function to join AND set up media
      * @param {Object} options - options to join with media
      * @param {JoinOptions} [options.joinOptions] - see #join()
-     * @param {MediaDirection} options.mediaSettings - see #addMedia()
-     * @param {AudioVideo} [options.audioVideoOptions] - see #getMediaStreams()
-     * @returns {Promise} -- {join: see join(), media: see addMedia(), local: see getMediaStreams()}
+     * @param {MediaDirection} [options.mediaOptions] - see #addMedia()
+     * @returns {Promise} -- {join: see join(), media: see addMedia()}
      * @public
      * @memberof Meeting
      * @example
      * joinWithMedia({
      *  joinOptions: {resourceId: 'resourceId' },
-     *  mediaSettings: {
-     *   sendAudio: true,
-     *   sendVideo: true,
-     *   sendShare: false,
-     *   receiveVideo:true,
-     *   receiveAudio: true,
-     *   receiveShare: true
-     * }
-     * audioVideoOptions: {
-     *   audio: 'audioDeviceId',
-     *   video: 'videoDeviceId'
-     * }})
+     *  mediaOptions: {
+     *    localTracks: { microphone: microphoneTrack, camera: cameraTrack }
+     *   }
+     * })
      */
   }, {
     key: "joinWithMedia",
     value: function joinWithMedia() {
-      var _this30 = this;
+      var _this24 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      // TODO: add validations for parameters
-      var mediaSettings = options.mediaSettings,
-        joinOptions = options.joinOptions,
-        audioVideoOptions = options.audioVideoOptions;
+      var mediaOptions = options.mediaOptions,
+        joinOptions = options.joinOptions;
       return this.join(joinOptions).then(function (joinResponse) {
-        return _this30.getMediaStreams(mediaSettings, audioVideoOptions).then(function (_ref20) {
-          var _ref21 = (0, _slicedToArray2.default)(_ref20, 2),
-            localStream = _ref21[0],
-            localShare = _ref21[1];
-          return _this30.addMedia({
-            mediaSettings: mediaSettings,
-            localShare: localShare,
-            localStream: localStream
-          }).then(function (mediaResponse) {
-            return {
-              join: joinResponse,
-              media: mediaResponse,
-              local: [localStream, localShare]
-            };
-          });
+        return _this24.addMedia(mediaOptions).then(function (mediaResponse) {
+          return {
+            join: joinResponse,
+            media: mediaResponse
+          };
         });
       }).catch(function (error) {
         _loggerProxy.default.logger.error('Meeting:index#joinWithMedia --> ', error);
         _metrics.default.sendBehavioralMetric(_constants2.default.JOIN_WITH_MEDIA_FAILURE, {
-          correlation_id: _this30.correlationId,
-          locus_id: _this30.locusUrl.split('/').pop(),
+          correlation_id: _this24.correlationId,
+          locus_id: _this24.locusUrl.split('/').pop(),
           reason: error.message,
           stack: error.stack
         }, {
@@ -4341,7 +3813,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "reconnect",
     value: function reconnect(options) {
-      var _this31 = this;
+      var _this25 = this;
       _loggerProxy.default.logger.log("Meeting:index#reconnect --> attempting to reconnect meeting ".concat(this.id));
       if (!this.reconnectionManager || !this.reconnectionManager.reconnect) {
         return _promise.default.reject(new _parameter.default('Cannot reconnect, ReconnectionManager must first be defined.'));
@@ -4369,13 +3841,13 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         function: 'reconnect'
       }, _constants.EVENT_TRIGGERS.MEETING_RECONNECTION_STARTING);
       return this.reconnectionManager.reconnect(options).then(function () {
-        _triggerProxy.default.trigger(_this31, {
+        _triggerProxy.default.trigger(_this25, {
           file: 'meeting/index',
           function: 'reconnect'
         }, _constants.EVENT_TRIGGERS.MEETING_RECONNECTION_SUCCESS);
         _loggerProxy.default.logger.log('Meeting:index#reconnect --> Meeting reconnect success');
       }).catch(function (error) {
-        _triggerProxy.default.trigger(_this31, {
+        _triggerProxy.default.trigger(_this25, {
           file: 'meeting/index',
           function: 'reconnect'
         }, _constants.EVENT_TRIGGERS.MEETING_RECONNECTION_FAILURE, {
@@ -4383,18 +3855,18 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         });
         _loggerProxy.default.logger.error('Meeting:index#reconnect --> Meeting reconnect failed', error);
         _metrics.default.sendBehavioralMetric(_constants2.default.MEETING_RECONNECT_FAILURE, {
-          correlation_id: _this31.correlationId,
-          locus_id: _this31.locusUrl.split('/').pop(),
+          correlation_id: _this25.correlationId,
+          locus_id: _this25.locusUrl.split('/').pop(),
           reason: error.message,
           stack: error.stack
         });
-        _this31.uploadLogs({
+        _this25.uploadLogs({
           file: 'meeting/index',
           function: 'reconnect'
         });
         return _promise.default.reject(new _reconnection.default('Reconnection failure event', error));
       }).finally(function () {
-        _this31.reconnectionManager.reset();
+        _this25.reconnectionManager.reset();
       });
     }
 
@@ -4437,16 +3909,16 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "monitorTranscriptionSocketConnection",
     value: function monitorTranscriptionSocketConnection() {
-      var _this32 = this;
+      var _this26 = this;
       this.transcription.onCloseSocket(function (event) {
         _loggerProxy.default.logger.info("Meeting:index#onCloseSocket -->\n        unable to continue receiving transcription;\n        low-latency mercury web socket connection is closed now.\n        ".concat(event));
-        _this32.triggerStopReceivingTranscriptionEvent();
+        _this26.triggerStopReceivingTranscriptionEvent();
       });
       this.transcription.onErrorSocket(function (event) {
         _loggerProxy.default.logger.error("Meeting:index#onErrorSocket -->\n         unable to continue receiving transcription;\n         low-latency mercury web socket connection error had occured.\n        ".concat(event));
-        _this32.triggerStopReceivingTranscriptionEvent();
+        _this26.triggerStopReceivingTranscriptionEvent();
         _metrics.default.sendBehavioralMetric(_constants2.default.RECEIVE_TRANSCRIPTION_FAILURE, {
-          correlation_id: _this32.correlationId,
+          correlation_id: _this26.correlationId,
           reason: 'unexpected error: transcription LLM web socket connection error had occured.',
           event: event
         });
@@ -4461,16 +3933,16 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "receiveTranscription",
     value: function () {
-      var _receiveTranscription = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var _this33 = this;
+      var _receiveTranscription = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+        var _this27 = this;
         var datachannelUrl, _yield$this$request, webSocketUrl;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator.default.wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _loggerProxy.default.logger.info("Meeting:index#receiveTranscription -->\n      Attempting to generate a web socket url.");
-              _context4.prev = 1;
+              _context8.prev = 1;
               datachannelUrl = this.locusInfo.info.datachannelUrl; // @ts-ignore - fix type
-              _context4.next = 5;
+              _context8.next = 5;
               return this.request({
                 method: _constants.HTTP_VERBS.POST,
                 uri: datachannelUrl,
@@ -4479,7 +3951,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 }
               });
             case 5:
-              _yield$this$request = _context4.sent;
+              _yield$this$request = _context8.sent;
               webSocketUrl = _yield$this$request.body.webSocketUrl;
               _loggerProxy.default.logger.info("Meeting:index#receiveTranscription -->\n        Generated web socket url succesfully.");
               this.transcription = new _transcription.default(webSocketUrl,
@@ -4489,7 +3961,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
 
               // retrieve and pass the payload
               this.transcription.subscribe(function (payload) {
-                _triggerProxy.default.trigger(_this33, {
+                _triggerProxy.default.trigger(_this27, {
                   file: 'meeting/index',
                   function: 'join'
                 }, _constants.EVENT_TRIGGERS.MEETING_STARTED_RECEIVING_TRANSCRIPTION, payload);
@@ -4497,22 +3969,22 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
               this.monitorTranscriptionSocketConnection();
               // @ts-ignore - fix type
               this.transcription.connect(this.webex.credentials.supertoken.access_token);
-              _context4.next = 19;
+              _context8.next = 19;
               break;
             case 15:
-              _context4.prev = 15;
-              _context4.t0 = _context4["catch"](1);
-              _loggerProxy.default.logger.error("Meeting:index#receiveTranscription --> ".concat(_context4.t0));
+              _context8.prev = 15;
+              _context8.t0 = _context8["catch"](1);
+              _loggerProxy.default.logger.error("Meeting:index#receiveTranscription --> ".concat(_context8.t0));
               _metrics.default.sendBehavioralMetric(_constants2.default.RECEIVE_TRANSCRIPTION_FAILURE, {
                 correlation_id: this.correlationId,
-                reason: _context4.t0.message,
-                stack: _context4.t0.stack
+                reason: _context8.t0.message,
+                stack: _context8.t0.stack
               });
             case 19:
             case "end":
-              return _context4.stop();
+              return _context8.stop();
           }
-        }, _callee4, this, [[1, 15]]);
+        }, _callee8, this, [[1, 15]]);
       }));
       function receiveTranscription() {
         return _receiveTranscription.apply(this, arguments);
@@ -4570,7 +4042,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "join",
     value: function join() {
-      var _this34 = this;
+      var _this28 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       // @ts-ignore - fix type
       if (!this.webex.meetings.registered) {
@@ -4654,21 +4126,17 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
             this.deferJoin = undefined;
             return _promise.default.reject(_error);
           }
-          this.mediaProperties.setLocalQualityLevel(options.meetingQuality);
           this.mediaProperties.setRemoteQualityLevel(options.meetingQuality);
         }
         if ((0, _typeof2.default)(options.meetingQuality) === 'object') {
-          if (!_constants.QUALITY_LEVELS[options.meetingQuality.local] && !_constants.QUALITY_LEVELS[options.meetingQuality.remote]) {
-            var _errorMessage2 = "Meeting:index#join --> ".concat(options.meetingQuality.local || options.meetingQuality.remote, " not defined");
+          if (!_constants.QUALITY_LEVELS[options.meetingQuality.remote]) {
+            var _errorMessage2 = "Meeting:index#join --> ".concat(options.meetingQuality.remote, " not defined");
             _loggerProxy.default.logger.error(_errorMessage2);
             var _error2 = new Error(_errorMessage2);
             joinFailed(_error2);
             this.deferJoin = undefined;
             return _promise.default.reject(new Error(_errorMessage2));
           }
-          if (options.meetingQuality.local) {
-            this.mediaProperties.setLocalQualityLevel(options.meetingQuality.local);
-          }
           if (options.meetingQuality.remote) {
             this.mediaProperties.setRemoteQualityLevel(options.meetingQuality.remote);
           }
@@ -4676,83 +4144,83 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }
       this.isMultistream = !!options.enableMultistream;
       return _util.default.joinMeetingOptions(this, options).then(function (join) {
-        _this34.meetingFiniteStateMachine.join();
+        _this28.meetingFiniteStateMachine.join();
         _loggerProxy.default.logger.log('Meeting:index#join --> Success');
         return join;
       }).then(function (join) {
         joinSuccess(join);
-        _this34.deferJoin = undefined;
+        _this28.deferJoin = undefined;
         _metrics.default.sendBehavioralMetric(_constants2.default.JOIN_SUCCESS, {
-          correlation_id: _this34.correlationId
+          correlation_id: _this28.correlationId
         });
         return join;
       }).then( /*#__PURE__*/function () {
-        var _ref22 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(join) {
-          return _regenerator.default.wrap(function _callee5$(_context5) {
-            while (1) switch (_context5.prev = _context5.next) {
+        var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(join) {
+          return _regenerator.default.wrap(function _callee9$(_context9) {
+            while (1) switch (_context9.prev = _context9.next) {
               case 0:
-                if (!_this34.config.enableAutomaticLLM) {
-                  _context5.next = 3;
+                if (!_this28.config.enableAutomaticLLM) {
+                  _context9.next = 3;
                   break;
                 }
-                _context5.next = 3;
-                return _this34.updateLLMConnection();
+                _context9.next = 3;
+                return _this28.updateLLMConnection();
               case 3:
-                return _context5.abrupt("return", join);
+                return _context9.abrupt("return", join);
               case 4:
               case "end":
-                return _context5.stop();
+                return _context9.stop();
             }
-          }, _callee5);
+          }, _callee9);
         }));
-        return function (_x3) {
-          return _ref22.apply(this, arguments);
+        return function (_x7) {
+          return _ref19.apply(this, arguments);
         };
       }()).then( /*#__PURE__*/function () {
-        var _ref23 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(join) {
-          return _regenerator.default.wrap(function _callee6$(_context6) {
-            while (1) switch (_context6.prev = _context6.next) {
+        var _ref20 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(join) {
+          return _regenerator.default.wrap(function _callee10$(_context10) {
+            while (1) switch (_context10.prev = _context10.next) {
               case 0:
                 if (!isBrowser) {
-                  _context6.next = 8;
+                  _context10.next = 8;
                   break;
                 }
-                if (!(_this34.config.receiveTranscription || options.receiveTranscription)) {
-                  _context6.next = 6;
+                if (!(_this28.config.receiveTranscription || options.receiveTranscription)) {
+                  _context10.next = 6;
                   break;
                 }
-                if (!_this34.isTranscriptionSupported()) {
-                  _context6.next = 6;
+                if (!_this28.isTranscriptionSupported()) {
+                  _context10.next = 6;
                   break;
                 }
-                _context6.next = 5;
-                return _this34.receiveTranscription();
+                _context10.next = 5;
+                return _this28.receiveTranscription();
               case 5:
                 _loggerProxy.default.logger.info('Meeting:index#join --> enabled to recieve transcription!');
               case 6:
-                _context6.next = 9;
+                _context10.next = 9;
                 break;
               case 8:
                 _loggerProxy.default.logger.error('Meeting:index#join --> Receving transcription is not supported on this platform');
               case 9:
-                return _context6.abrupt("return", join);
+                return _context10.abrupt("return", join);
               case 10:
               case "end":
-                return _context6.stop();
+                return _context10.stop();
             }
-          }, _callee6);
+          }, _callee10);
         }));
-        return function (_x4) {
-          return _ref23.apply(this, arguments);
+        return function (_x8) {
+          return _ref20.apply(this, arguments);
         };
       }()).catch(function (error) {
         var _error$error;
-        _this34.meetingFiniteStateMachine.fail(error);
+        _this28.meetingFiniteStateMachine.fail(error);
         _loggerProxy.default.logger.error('Meeting:index#join --> Failed', error);
         _metrics.default.postEvent({
           event: _config.eventType.LOCUS_JOIN_RESPONSE,
-          meeting: _this34,
-          meetingId: _this34.id,
+          meeting: _this28,
+          meetingId: _this28.id,
           data: {
             errors: [_metrics.default.parseLocusError(error.error, true)]
           }
@@ -4760,18 +4228,18 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
 
         // TODO:  change this to error codes and pre defined dictionary
         _metrics.default.sendBehavioralMetric(_constants2.default.JOIN_FAILURE, {
-          correlation_id: _this34.correlationId,
+          correlation_id: _this28.correlationId,
           reason: (_error$error = error.error) === null || _error$error === void 0 ? void 0 : _error$error.message,
           stack: error.stack
         });
 
         // Upload logs on join Failure
-        _triggerProxy.default.trigger(_this34, {
+        _triggerProxy.default.trigger(_this28, {
           file: 'meeting/index',
           function: 'join'
-        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this34);
+        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this28);
         joinFailed(error);
-        _this34.deferJoin = undefined;
+        _this28.deferJoin = undefined;
         return _promise.default.reject(error);
       });
     }
@@ -4785,50 +4253,50 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "updateLLMConnection",
     value: function () {
-      var _updateLLMConnection = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
-        var _this35 = this;
+      var _updateLLMConnection = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
+        var _this29 = this;
         var _this$locusInfo6, url, _this$locusInfo6$info, _this$locusInfo6$info2, datachannelUrl, isJoined;
-        return _regenerator.default.wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regenerator.default.wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               // @ts-ignore - Fix type
               _this$locusInfo6 = this.locusInfo, url = _this$locusInfo6.url, _this$locusInfo6$info = _this$locusInfo6.info, _this$locusInfo6$info2 = _this$locusInfo6$info === void 0 ? {} : _this$locusInfo6$info, datachannelUrl = _this$locusInfo6$info2.datachannelUrl;
               isJoined = this.joinedWith && this.joinedWith.state === 'JOINED'; // @ts-ignore - Fix type
               if (!this.webex.internal.llm.isConnected()) {
-                _context7.next = 8;
+                _context11.next = 8;
                 break;
               }
               if (!(url === this.webex.internal.llm.getLocusUrl() && isJoined)) {
-                _context7.next = 5;
+                _context11.next = 5;
                 break;
               }
-              return _context7.abrupt("return", undefined);
+              return _context11.abrupt("return", undefined);
             case 5:
-              _context7.next = 7;
+              _context11.next = 7;
               return this.webex.internal.llm.disconnectLLM();
             case 7:
               // @ts-ignore - Fix type
               this.webex.internal.llm.off('event:relay.event', this.processRelayEvent);
             case 8:
               if (isJoined) {
-                _context7.next = 10;
+                _context11.next = 10;
                 break;
               }
-              return _context7.abrupt("return", undefined);
+              return _context11.abrupt("return", undefined);
             case 10:
-              return _context7.abrupt("return", this.webex.internal.llm.registerAndConnect(url, datachannelUrl).then(function (registerAndConnectResult) {
+              return _context11.abrupt("return", this.webex.internal.llm.registerAndConnect(url, datachannelUrl).then(function (registerAndConnectResult) {
                 // @ts-ignore - Fix type
-                _this35.webex.internal.llm.off('event:relay.event', _this35.processRelayEvent);
+                _this29.webex.internal.llm.off('event:relay.event', _this29.processRelayEvent);
                 // @ts-ignore - Fix type
-                _this35.webex.internal.llm.on('event:relay.event', _this35.processRelayEvent);
+                _this29.webex.internal.llm.on('event:relay.event', _this29.processRelayEvent);
                 _loggerProxy.default.logger.info('Meeting:index#updateLLMConnection --> enabled to receive relay events!');
                 return _promise.default.resolve(registerAndConnectResult);
               }));
             case 11:
             case "end":
-              return _context7.stop();
+              return _context11.stop();
           }
-        }, _callee7, this);
+        }, _callee11, this);
       }));
       function updateLLMConnection() {
         return _updateLLMConnection.apply(this, arguments);
@@ -4873,7 +4341,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "dialInPstn",
     value: function dialInPstn() {
-      var _this36 = this;
+      var _this30 = this;
       if (this.isPhoneProvisioned(this.dialInDeviceStatus)) return _promise.default.resolve(); // prevent multiple dial in devices from being provisioned
 
       var correlationId = this.correlationId,
@@ -4889,10 +4357,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }).catch(function (error) {
         var _error$error2;
         _metrics.default.sendBehavioralMetric(_constants2.default.ADD_DIAL_IN_FAILURE, {
-          correlation_id: _this36.correlationId,
-          dial_in_url: _this36.dialInUrl,
+          correlation_id: _this30.correlationId,
+          dial_in_url: _this30.dialInUrl,
           locus_id: locusUrl.split('/').pop(),
-          client_url: _this36.deviceUrl,
+          client_url: _this30.deviceUrl,
           reason: (_error$error2 = error.error) === null || _error$error2 === void 0 ? void 0 : _error$error2.message,
           stack: error.stack
         });
@@ -4910,7 +4378,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "dialOutPstn",
     value: function dialOutPstn(phoneNumber) {
-      var _this37 = this;
+      var _this31 = this;
       if (this.isPhoneProvisioned(this.dialOutDeviceStatus)) return _promise.default.resolve(); // prevent multiple dial out devices from being provisioned
 
       var correlationId = this.correlationId,
@@ -4927,10 +4395,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }).catch(function (error) {
         var _error$error3;
         _metrics.default.sendBehavioralMetric(_constants2.default.ADD_DIAL_OUT_FAILURE, {
-          correlation_id: _this37.correlationId,
-          dial_out_url: _this37.dialOutUrl,
+          correlation_id: _this31.correlationId,
+          dial_out_url: _this31.dialOutUrl,
           locus_id: locusUrl.split('/').pop(),
-          client_url: _this37.deviceUrl,
+          client_url: _this31.deviceUrl,
           reason: (_error$error3 = error.error) === null || _error$error3 === void 0 ? void 0 : _error$error3.message,
           stack: error.stack
         });
@@ -4961,7 +4429,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "moveTo",
     value: function moveTo(resourceId) {
-      var _this38 = this;
+      var _this32 = this;
       if (!resourceId) {
         throw new _parameter.default('Cannot move call without a resourceId.');
       }
@@ -4991,18 +4459,18 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         event: _config.eventType.MOVE_MEDIA,
         meeting: this
       });
-      this.locusInfo.once(_constants.LOCUSINFO.EVENTS.SELF_OBSERVING, /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+      this.locusInfo.once(_constants.LOCUSINFO.EVENTS.SELF_OBSERVING, /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
         var mediaSettings;
-        return _regenerator.default.wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regenerator.default.wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context8.prev = 0;
-              if (!_this38.isSharing) {
-                _context8.next = 4;
+              _context12.prev = 0;
+              if (!_this32.isSharing) {
+                _context12.next = 4;
                 break;
               }
-              _context8.next = 4;
-              return _this38.releaseScreenShareFloor();
+              _context12.next = 4;
+              return _this32.releaseScreenShareFloor();
             case 4:
               mediaSettings = {
                 mediaDirection: {
@@ -5013,55 +4481,48 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   sendShare: false,
                   receiveShare: true
                 }
-              }; // clean up the local tracks
-              _this38.mediaProperties.setMediaDirection(mediaSettings.mediaDirection);
-
-              // close the existing local tracks
-              _context8.next = 8;
-              return _this38.closeLocalStream();
-            case 8:
-              _context8.next = 10;
-              return _this38.closeLocalShare();
-            case 10:
-              _this38.mediaProperties.unsetMediaTracks();
+              };
+              _this32.cleanupLocalTracks();
+              _this32.mediaProperties.setMediaDirection(mediaSettings.mediaDirection);
+              _this32.mediaProperties.unsetRemoteMedia();
 
               // when a move to is intiated by the client , Locus delets the existing media node from the server as soon the DX answers the meeting
               // once the DX answers we establish connection back the media server with only receiveShare enabled
               // @ts-ignore - reconnectMedia does not accept any argument
-              _context8.next = 13;
-              return _this38.reconnectionManager.reconnectMedia(mediaSettings).then(function () {
+              _context12.next = 10;
+              return _this32.reconnectionManager.reconnectMedia(mediaSettings).then(function () {
                 _metrics.default.sendBehavioralMetric(_constants2.default.MOVE_TO_SUCCESS);
               });
-            case 13:
-              _context8.next = 19;
+            case 10:
+              _context12.next = 16;
               break;
-            case 15:
-              _context8.prev = 15;
-              _context8.t0 = _context8["catch"](0);
-              _loggerProxy.default.logger.error('Meeting:index#moveTo --> Failed to moveTo resourceId', _context8.t0);
+            case 12:
+              _context12.prev = 12;
+              _context12.t0 = _context12["catch"](0);
+              _loggerProxy.default.logger.error('Meeting:index#moveTo --> Failed to moveTo resourceId', _context12.t0);
               _metrics.default.sendBehavioralMetric(_constants2.default.MOVE_TO_FAILURE, {
-                correlation_id: _this38.correlationId,
-                locus_id: _this38.locusUrl.split('/').pop(),
-                reason: _context8.t0.message,
-                stack: _context8.t0.stack
+                correlation_id: _this32.correlationId,
+                locus_id: _this32.locusUrl.split('/').pop(),
+                reason: _context12.t0.message,
+                stack: _context12.t0.stack
               });
-            case 19:
+            case 16:
             case "end":
-              return _context8.stop();
+              return _context12.stop();
           }
-        }, _callee8, null, [[0, 15]]);
+        }, _callee12, null, [[0, 12]]);
       })));
       _loggerProxy.default.logger.info('Meeting:index#moveTo --> Initated moved to using resourceId', resourceId);
       return _util.default.joinMeetingOptions(this, {
         resourceId: resourceId,
         moveToResource: true
       }).then(function () {
-        _this38.meetingFiniteStateMachine.join();
+        _this32.meetingFiniteStateMachine.join();
       }).catch(function (error) {
-        _this38.meetingFiniteStateMachine.fail(error);
+        _this32.meetingFiniteStateMachine.fail(error);
         _metrics.default.sendBehavioralMetric(_constants2.default.MOVE_TO_FAILURE, {
-          correlation_id: _this38.correlationId,
-          locus_id: _this38.locusUrl.split('/').pop(),
+          correlation_id: _this32.correlationId,
+          locus_id: _this32.locusUrl.split('/').pop(),
           reason: error.message,
           stack: error.stack
         });
@@ -5080,7 +4541,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "moveFrom",
     value: function moveFrom(resourceId) {
-      var _this39 = this;
+      var _this33 = this;
       // On moveFrom ask the developer to re capture it moveFrom  then updateMedia
       if (!resourceId) {
         throw new _parameter.default('Cannot move call without a resourceId.');
@@ -5091,19 +4552,19 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         meeting: this
       });
       return _util.default.joinMeetingOptions(this).then(function () {
-        return _util.default.leaveMeeting(_this39, {
+        return _util.default.leaveMeeting(_this33, {
           resourceId: resourceId,
           correlationId: oldCorrelationId,
           moveMeeting: true
         }).then(function () {
-          _this39.resourceId = '';
+          _this33.resourceId = '';
           _metrics.default.sendBehavioralMetric(_constants2.default.MOVE_FROM_SUCCESS);
         });
       }).catch(function (error) {
-        _this39.meetingFiniteStateMachine.fail(error);
+        _this33.meetingFiniteStateMachine.fail(error);
         _metrics.default.sendBehavioralMetric(_constants2.default.MOVE_FROM_FAILURE, {
-          correlation_id: _this39.correlationId,
-          locus_id: _this39.locusUrl.split('/').pop(),
+          correlation_id: _this33.correlationId,
+          locus_id: _this33.locusUrl.split('/').pop(),
           reason: error.message,
           stack: error.stack
         });
@@ -5113,17 +4574,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     }
 
     /**
-     * Get local media streams based on options passed
+     * Handles ROAP_FAILURE event from the webrtc media connection
      *
-     * NOTE: this method can only be used with transcoded meetings, not with multistream meetings
-     *
-     * @param {MediaDirection} mediaDirection A configurable options object for joining a meeting
-     * @param {AudioVideo} [audioVideo] audio/video object to set audioinput and videoinput devices, see #Media.getUserMedia
-     * @param {SharePreferences} [sharePreferences] audio/video object to set audioinput and videoinput devices, see #Media.getUserMedia
-     * @returns {Promise} see #Media.getUserMedia
-     * @public
-     * @todo should be static, or moved so can be called outside of a meeting
-     * @memberof Meeting
+     * @param {Error} error
+     * @returns {void}
      */
   }, {
     key: "getMediaConnectionDebugId",
@@ -5132,7 +4586,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     }
 
     /**
-     * Creates a webrtc media connection
+     * Creates a webrtc media connection and publishes tracks to it
      *
      * @param {Object} turnServerInfo TURN server information
      * @param {BundlePolicy} [bundlePolicy] Bundle policy settings
@@ -5140,22 +4594,60 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
      */
   }, {
     key: "createMediaConnection",
-    value: function createMediaConnection(turnServerInfo, bundlePolicy) {
-      var mc = _media.default.createMediaConnection(this.isMultistream, this.getMediaConnectionDebugId(), {
-        mediaProperties: this.mediaProperties,
-        remoteQualityLevel: this.mediaProperties.remoteQualityLevel,
-        // @ts-ignore - config coming from registerPlugin
-        enableRtx: this.config.enableRtx,
-        // @ts-ignore - config coming from registerPlugin
-        enableExtmap: this.config.enableExtmap,
-        turnServerInfo: turnServerInfo,
-        bundlePolicy: bundlePolicy
-      });
-      this.mediaProperties.setMediaPeerConnection(mc);
-      this.setupMediaConnectionListeners();
-      return mc;
-    }
+    value: function () {
+      var _createMediaConnection = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(turnServerInfo, bundlePolicy) {
+        var mc;
+        return _regenerator.default.wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
+            case 0:
+              // create the actual media connection
+              mc = _media.default.createMediaConnection(this.isMultistream, this.getMediaConnectionDebugId(), {
+                mediaProperties: this.mediaProperties,
+                remoteQualityLevel: this.mediaProperties.remoteQualityLevel,
+                // @ts-ignore - config coming from registerPlugin
+                enableRtx: this.config.enableRtx,
+                // @ts-ignore - config coming from registerPlugin
+                enableExtmap: this.config.enableExtmap,
+                turnServerInfo: turnServerInfo,
+                bundlePolicy: bundlePolicy
+              });
+              this.mediaProperties.setMediaPeerConnection(mc);
+              this.setupMediaConnectionListeners();
 
+              // publish the tracks
+              if (!this.mediaProperties.audioTrack) {
+                _context13.next = 6;
+                break;
+              }
+              _context13.next = 6;
+              return this.publishTrack(this.mediaProperties.audioTrack);
+            case 6:
+              if (!this.mediaProperties.videoTrack) {
+                _context13.next = 9;
+                break;
+              }
+              _context13.next = 9;
+              return this.publishTrack(this.mediaProperties.videoTrack);
+            case 9:
+              if (!this.mediaProperties.shareTrack) {
+                _context13.next = 12;
+                break;
+              }
+              _context13.next = 12;
+              return this.publishTrack(this.mediaProperties.shareTrack);
+            case 12:
+              return _context13.abrupt("return", mc);
+            case 13:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13, this);
+      }));
+      function createMediaConnection(_x9, _x10) {
+        return _createMediaConnection.apply(this, arguments);
+      }
+      return createMediaConnection;
+    }()
     /**
      * Listens for an event emitted by eventEmitter and emits it from the meeting object
      *
@@ -5168,9 +4660,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "forwardEvent",
     value: function forwardEvent(eventEmitter, eventTypeToForward, meetingEventType) {
-      var _this40 = this;
+      var _this34 = this;
       eventEmitter.on(eventTypeToForward, function (data) {
-        return _triggerProxy.default.trigger(_this40, {
+        return _triggerProxy.default.trigger(_this34, {
           file: 'meetings',
           function: 'addMedia'
         }, meetingEventType, data);
@@ -5178,14 +4670,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     }
 
     /**
-     * Specify joining via audio (option: pstn), video, screenshare
-     * @param {Object} options A configurable options object for joining a meeting
-     * @param {Object} options.resourceId pass the deviceId
-     * @param {MediaDirection} options.mediaSettings pass media options
-     * @param {MediaStream} options.localStream
-     * @param {MediaStream} options.localShare
-     * @param {BundlePolicy} options.bundlePolicy bundle policy for multistream meetings
-     * @param {RemoteMediaManagerConfig} options.remoteMediaManagerConfig only applies if multistream is enabled
+     * Creates a media connection to the server. Media connection is required for sending or receiving any audio/video.
+     *
+     * @param {AddMediaOptions} options
      * @returns {Promise}
      * @public
      * @memberof Meeting
@@ -5193,11 +4680,13 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "addMedia",
     value: function addMedia() {
-      var _this41 = this;
+      var _localTracks$screenSh,
+        _this35 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var LOG_HEADER = 'Meeting:index#addMedia -->';
       var turnDiscoverySkippedReason;
       var turnServerUsed = false;
+      _loggerProxy.default.logger.info("".concat(LOG_HEADER, " called with: ").concat((0, _stringify.default)(options)));
       if (this.meetingState !== _constants.FULL_STATE.ACTIVE) {
         return _promise.default.reject(new _webexErrors.MeetingNotActiveError());
       }
@@ -5209,12 +4698,15 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       if (this.isUserUnadmitted && !this.wirelessShare) {
         return _promise.default.reject(new _webexErrors.UserInLobbyError());
       }
-      var localStream = options.localStream,
-        localShare = options.localShare,
-        mediaSettings = options.mediaSettings,
+      var localTracks = options.localTracks,
+        _options$audioEnabled = options.audioEnabled,
+        audioEnabled = _options$audioEnabled === void 0 ? true : _options$audioEnabled,
+        _options$videoEnabled = options.videoEnabled,
+        videoEnabled = _options$videoEnabled === void 0 ? true : _options$videoEnabled,
+        _options$receiveShare = options.receiveShare,
+        receiveShare = _options$receiveShare === void 0 ? true : _options$receiveShare,
         remoteMediaManagerConfig = options.remoteMediaManagerConfig,
         bundlePolicy = options.bundlePolicy;
-      _loggerProxy.default.logger.info("".concat(LOG_HEADER, " Adding Media."));
       _metrics.default.postEvent({
         event: _config.eventType.MEDIA_CAPABILITIES,
         meeting: this,
@@ -5237,58 +4729,103 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           }
         }
       });
-      return _util.default.validateOptions(options).then(function () {
-        _this41.locusMediaRequest = new _locusMediaRequest.LocusMediaRequest({
-          correlationId: _this41.correlationId,
-          device: {
-            url: _this41.deviceUrl,
-            // @ts-ignore
-            deviceType: _this41.config.deviceType
-          },
-          preferTranscoding: !_this41.isMultistream
-        }, {
+
+      // when audioEnabled/videoEnabled is true, we set sendAudio/sendVideo to true even before any tracks are published
+      // to avoid doing an extra SDP exchange when they are published for the first time
+      this.mediaProperties.setMediaDirection({
+        sendAudio: audioEnabled,
+        sendVideo: videoEnabled,
+        sendShare: false,
+        receiveAudio: audioEnabled,
+        receiveVideo: videoEnabled,
+        receiveShare: receiveShare
+      });
+      this.locusMediaRequest = new _locusMediaRequest.LocusMediaRequest({
+        correlationId: this.correlationId,
+        device: {
+          url: this.deviceUrl,
           // @ts-ignore
-          parent: _this41.webex
-        });
-      }).then(function () {
-        return _this41.roap.doTurnDiscovery(_this41, false);
-      }).then(function (turnDiscoveryObject) {
-        turnDiscoverySkippedReason = turnDiscoveryObject.turnDiscoverySkippedReason;
-        turnServerUsed = !turnDiscoverySkippedReason;
-        var turnServerInfo = turnDiscoveryObject.turnServerInfo;
-        _this41.preMedia(localStream, localShare, mediaSettings);
-        var mc = _this41.createMediaConnection(turnServerInfo, bundlePolicy);
-        if (_this41.isMultistream) {
-          _this41.remoteMediaManager = new _remoteMediaManager.RemoteMediaManager(_this41.receiveSlotManager, _this41.mediaRequestManagers, remoteMediaManagerConfig);
-          _this41.forwardEvent(_this41.remoteMediaManager, _remoteMediaManager.Event.AudioCreated, _constants.EVENT_TRIGGERS.REMOTE_MEDIA_AUDIO_CREATED);
-          _this41.forwardEvent(_this41.remoteMediaManager, _remoteMediaManager.Event.ScreenShareAudioCreated, _constants.EVENT_TRIGGERS.REMOTE_MEDIA_SCREEN_SHARE_AUDIO_CREATED);
-          _this41.forwardEvent(_this41.remoteMediaManager, _remoteMediaManager.Event.VideoLayoutChanged, _constants.EVENT_TRIGGERS.REMOTE_MEDIA_VIDEO_LAYOUT_CHANGED);
-          return _this41.remoteMediaManager.start().then(function () {
-            return mc.initiateOffer();
-          });
-        }
-        return mc.initiateOffer();
-      }).then(function () {
-        _this41.setMercuryListener();
+          deviceType: this.config.deviceType
+        },
+        preferTranscoding: !this.isMultistream
+      }, {
+        // @ts-ignore
+        parent: this.webex
+      });
+      this.audio = (0, _muteState.createMuteState)(_constants.AUDIO, this, audioEnabled);
+      this.video = (0, _muteState.createMuteState)(_constants.VIDEO, this, videoEnabled);
+      this.annotationInfo = localTracks === null || localTracks === void 0 ? void 0 : localTracks.annotationInfo;
+      var promises = [];
+
+      // setup all the references to local tracks in this.mediaProperties before creating media connection
+      // and before TURN discovery, so that the correct mute state is sent with TURN discovery roap messages
+      if (localTracks !== null && localTracks !== void 0 && localTracks.microphone) {
+        promises.push(this.setLocalAudioTrack(localTracks.microphone));
+      }
+      if (localTracks !== null && localTracks !== void 0 && localTracks.camera) {
+        promises.push(this.setLocalVideoTrack(localTracks.camera));
+      }
+      if (localTracks !== null && localTracks !== void 0 && (_localTracks$screenSh = localTracks.screenShare) !== null && _localTracks$screenSh !== void 0 && _localTracks$screenSh.video) {
+        promises.push(this.setLocalShareTrack(localTracks.screenShare.video));
+      }
+      return _promise.default.all(promises).then(function () {
+        return _this35.roap.doTurnDiscovery(_this35, false);
+      }).then( /*#__PURE__*/function () {
+        var _ref22 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(turnDiscoveryObject) {
+          var turnServerInfo, mc;
+          return _regenerator.default.wrap(function _callee14$(_context14) {
+            while (1) switch (_context14.prev = _context14.next) {
+              case 0:
+                turnDiscoverySkippedReason = turnDiscoveryObject.turnDiscoverySkippedReason;
+                turnServerUsed = !turnDiscoverySkippedReason;
+                turnServerInfo = turnDiscoveryObject.turnServerInfo;
+                _context14.next = 5;
+                return _this35.createMediaConnection(turnServerInfo, bundlePolicy);
+              case 5:
+                mc = _context14.sent;
+                if (!_this35.isMultistream) {
+                  _context14.next = 13;
+                  break;
+                }
+                _this35.remoteMediaManager = new _remoteMediaManager.RemoteMediaManager(_this35.receiveSlotManager, _this35.mediaRequestManagers, remoteMediaManagerConfig);
+                _this35.forwardEvent(_this35.remoteMediaManager, _remoteMediaManager.Event.AudioCreated, _constants.EVENT_TRIGGERS.REMOTE_MEDIA_AUDIO_CREATED);
+                _this35.forwardEvent(_this35.remoteMediaManager, _remoteMediaManager.Event.ScreenShareAudioCreated, _constants.EVENT_TRIGGERS.REMOTE_MEDIA_SCREEN_SHARE_AUDIO_CREATED);
+                _this35.forwardEvent(_this35.remoteMediaManager, _remoteMediaManager.Event.VideoLayoutChanged, _constants.EVENT_TRIGGERS.REMOTE_MEDIA_VIDEO_LAYOUT_CHANGED);
+                _context14.next = 13;
+                return _this35.remoteMediaManager.start();
+              case 13:
+                _context14.next = 15;
+                return mc.initiateOffer();
+              case 15:
+              case "end":
+                return _context14.stop();
+            }
+          }, _callee14);
+        }));
+        return function (_x11) {
+          return _ref22.apply(this, arguments);
+        };
+      }()).then(function () {
+        _this35.setMercuryListener();
       }).then(function () {
-        return _this41.getDevices().then(function (devices) {
+        return (0, _mediaHelpers.getDevices)().then(function (devices) {
           _util.default.handleDeviceLogging(devices);
         });
       }).then(function () {
-        _this41.handleMediaLogging(_this41.mediaProperties);
+        _this35.handleMediaLogging(_this35.mediaProperties);
         _loggerProxy.default.logger.info("".concat(LOG_HEADER, " media connection created"));
 
         // @ts-ignore - config coming from registerPlugin
-        if (_this41.config.stats.enableStatsAnalyzer) {
+        if (_this35.config.stats.enableStatsAnalyzer) {
           // @ts-ignore - config coming from registerPlugin
-          _this41.networkQualityMonitor = new _networkQualityMonitor.default(_this41.config.stats);
-          _this41.statsAnalyzer = new _statsAnalyzer.StatsAnalyzer(
+          _this35.networkQualityMonitor = new _networkQualityMonitor.default(_this35.config.stats);
+          _this35.statsAnalyzer = new _statsAnalyzer.StatsAnalyzer(
           // @ts-ignore - config coming from registerPlugin
-          _this41.config.stats, function (ssrc) {
-            return _this41.receiveSlotManager.findReceiveSlotBySsrc(ssrc);
-          }, _this41.networkQualityMonitor);
-          _this41.setupStatsAnalyzerEventHandlers();
-          _this41.networkQualityMonitor.on(_constants.EVENT_TRIGGERS.NETWORK_QUALITY, _this41.sendNetworkQualityEvent.bind(_this41));
+          _this35.config.stats, function (ssrc) {
+            return _this35.receiveSlotManager.findReceiveSlotBySsrc(ssrc);
+          }, _this35.networkQualityMonitor);
+          _this35.setupStatsAnalyzerEventHandlers();
+          _this35.networkQualityMonitor.on(_constants.EVENT_TRIGGERS.NETWORK_QUALITY, _this35.sendNetworkQualityEvent.bind(_this35));
         }
       }).catch(function (error) {
         _loggerProxy.default.logger.error("".concat(LOG_HEADER, " Error adding media , setting up peerconnection, "), error);
@@ -5299,12 +4836,12 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
 
           // eslint-disable-next-line func-names
           // eslint-disable-next-line prefer-arrow-callback
-          if (_this41.type === _constants._CALL_) {
+          if (_this35.type === _constants._CALL_ || _this35.meetingState === _constants.FULL_STATE.ACTIVE) {
             resolve();
           }
           var joiningTimer = setInterval(function () {
             timerCount += 1;
-            if (_this41.meetingState === _constants.FULL_STATE.ACTIVE) {
+            if (_this35.meetingState === _constants.FULL_STATE.ACTIVE) {
               clearInterval(joiningTimer);
               resolve();
             }
@@ -5315,62 +4852,74 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           }, 1000);
         });
       }).then(function () {
-        return _this41.mediaProperties.waitForMediaConnectionConnected().catch(function () {
-          throw new Error("Timed out waiting for media connection to be connected, correlationId=".concat(_this41.correlationId));
+        return _this35.mediaProperties.waitForMediaConnectionConnected().catch(function () {
+          throw new Error("Timed out waiting for media connection to be connected, correlationId=".concat(_this35.correlationId));
         });
       }).then(function () {
-        _loggerProxy.default.logger.info("".concat(LOG_HEADER, " PeerConnection CONNECTED"));
-        if (mediaSettings && mediaSettings.sendShare && localShare) {
-          if (_this41.state === _constants.MEETING_STATE.STATES.JOINED) {
-            return _this41.requestScreenShareFloor();
-          }
-
-          // When the self state changes to JOINED then request the floor
-          _this41.floorGrantPending = true;
+        var _localTracks$screenSh2;
+        if (localTracks !== null && localTracks !== void 0 && (_localTracks$screenSh2 = localTracks.screenShare) !== null && _localTracks$screenSh2 !== void 0 && _localTracks$screenSh2.video) {
+          _this35.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
+            lambda: function () {
+              var _lambda = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15() {
+                return _regenerator.default.wrap(function _callee15$(_context15) {
+                  while (1) switch (_context15.prev = _context15.next) {
+                    case 0:
+                      return _context15.abrupt("return", _this35.requestScreenShareFloor());
+                    case 1:
+                    case "end":
+                      return _context15.stop();
+                  }
+                }, _callee15);
+              }));
+              function lambda() {
+                return _lambda.apply(this, arguments);
+              }
+              return lambda;
+            }()
+          });
         }
-        return {};
       }).then(function () {
-        return _this41.mediaProperties.getCurrentConnectionType();
+        return _this35.mediaProperties.getCurrentConnectionType();
       }).then(function (connectionType) {
         _metrics.default.sendBehavioralMetric(_constants2.default.ADD_MEDIA_SUCCESS, {
-          correlation_id: _this41.correlationId,
-          locus_id: _this41.locusUrl.split('/').pop(),
+          correlation_id: _this35.correlationId,
+          locus_id: _this35.locusUrl.split('/').pop(),
           connectionType: connectionType,
-          isMultistream: _this41.isMultistream
+          isMultistream: _this35.isMultistream
         });
       }).catch(function (error) {
-        var _this41$mediaProperti, _this41$mediaProperti2, _this41$mediaProperti3, _this41$mediaProperti4, _this41$mediaProperti5, _this41$mediaProperti6, _this41$mediaProperti7, _this41$mediaProperti8, _this41$mediaProperti9, _this41$mediaProperti10, _this41$mediaProperti11, _this41$mediaProperti12, _this41$mediaProperti13, _this41$mediaProperti14, _this41$mediaProperti15, _this41$mediaProperti16, _this41$mediaProperti17, _this41$mediaProperti18, _this41$mediaProperti19, _this41$mediaProperti20, _this41$mediaProperti21;
+        var _this35$mediaProperti, _this35$mediaProperti2, _this35$mediaProperti3, _this35$mediaProperti4, _this35$mediaProperti5, _this35$mediaProperti6, _this35$mediaProperti7, _this35$mediaProperti8, _this35$mediaProperti9, _this35$mediaProperti10, _this35$mediaProperti11, _this35$mediaProperti12, _this35$mediaProperti13, _this35$mediaProperti14, _this35$mediaProperti15, _this35$mediaProperti16, _this35$mediaProperti17, _this35$mediaProperti18, _this35$mediaProperti19, _this35$mediaProperti20, _this35$mediaProperti21;
         _metrics.default.sendBehavioralMetric(_constants2.default.ADD_MEDIA_FAILURE, {
-          correlation_id: _this41.correlationId,
-          locus_id: _this41.locusUrl.split('/').pop(),
+          correlation_id: _this35.correlationId,
+          locus_id: _this35.locusUrl.split('/').pop(),
           reason: error.message,
           stack: error.stack,
           code: error.code,
           turnDiscoverySkippedReason: turnDiscoverySkippedReason,
           turnServerUsed: turnServerUsed,
-          isMultistream: _this41.isMultistream,
-          signalingState: ((_this41$mediaProperti = _this41.mediaProperties.webrtcMediaConnection) === null || _this41$mediaProperti === void 0 ? void 0 : (_this41$mediaProperti2 = _this41$mediaProperti.multistreamConnection) === null || _this41$mediaProperti2 === void 0 ? void 0 : (_this41$mediaProperti3 = _this41$mediaProperti2.pc) === null || _this41$mediaProperti3 === void 0 ? void 0 : (_this41$mediaProperti4 = _this41$mediaProperti3.pc) === null || _this41$mediaProperti4 === void 0 ? void 0 : _this41$mediaProperti4.signalingState) || ((_this41$mediaProperti5 = _this41.mediaProperties.webrtcMediaConnection) === null || _this41$mediaProperti5 === void 0 ? void 0 : (_this41$mediaProperti6 = _this41$mediaProperti5.mediaConnection) === null || _this41$mediaProperti6 === void 0 ? void 0 : (_this41$mediaProperti7 = _this41$mediaProperti6.pc) === null || _this41$mediaProperti7 === void 0 ? void 0 : _this41$mediaProperti7.signalingState) || 'unknown',
-          connectionState: ((_this41$mediaProperti8 = _this41.mediaProperties.webrtcMediaConnection) === null || _this41$mediaProperti8 === void 0 ? void 0 : (_this41$mediaProperti9 = _this41$mediaProperti8.multistreamConnection) === null || _this41$mediaProperti9 === void 0 ? void 0 : (_this41$mediaProperti10 = _this41$mediaProperti9.pc) === null || _this41$mediaProperti10 === void 0 ? void 0 : (_this41$mediaProperti11 = _this41$mediaProperti10.pc) === null || _this41$mediaProperti11 === void 0 ? void 0 : _this41$mediaProperti11.connectionState) || ((_this41$mediaProperti12 = _this41.mediaProperties.webrtcMediaConnection) === null || _this41$mediaProperti12 === void 0 ? void 0 : (_this41$mediaProperti13 = _this41$mediaProperti12.mediaConnection) === null || _this41$mediaProperti13 === void 0 ? void 0 : (_this41$mediaProperti14 = _this41$mediaProperti13.pc) === null || _this41$mediaProperti14 === void 0 ? void 0 : _this41$mediaProperti14.connectionState) || 'unknown',
-          iceConnectionState: ((_this41$mediaProperti15 = _this41.mediaProperties.webrtcMediaConnection) === null || _this41$mediaProperti15 === void 0 ? void 0 : (_this41$mediaProperti16 = _this41$mediaProperti15.multistreamConnection) === null || _this41$mediaProperti16 === void 0 ? void 0 : (_this41$mediaProperti17 = _this41$mediaProperti16.pc) === null || _this41$mediaProperti17 === void 0 ? void 0 : (_this41$mediaProperti18 = _this41$mediaProperti17.pc) === null || _this41$mediaProperti18 === void 0 ? void 0 : _this41$mediaProperti18.iceConnectionState) || ((_this41$mediaProperti19 = _this41.mediaProperties.webrtcMediaConnection) === null || _this41$mediaProperti19 === void 0 ? void 0 : (_this41$mediaProperti20 = _this41$mediaProperti19.mediaConnection) === null || _this41$mediaProperti20 === void 0 ? void 0 : (_this41$mediaProperti21 = _this41$mediaProperti20.pc) === null || _this41$mediaProperti21 === void 0 ? void 0 : _this41$mediaProperti21.iceConnectionState) || 'unknown'
+          isMultistream: _this35.isMultistream,
+          signalingState: ((_this35$mediaProperti = _this35.mediaProperties.webrtcMediaConnection) === null || _this35$mediaProperti === void 0 ? void 0 : (_this35$mediaProperti2 = _this35$mediaProperti.multistreamConnection) === null || _this35$mediaProperti2 === void 0 ? void 0 : (_this35$mediaProperti3 = _this35$mediaProperti2.pc) === null || _this35$mediaProperti3 === void 0 ? void 0 : (_this35$mediaProperti4 = _this35$mediaProperti3.pc) === null || _this35$mediaProperti4 === void 0 ? void 0 : _this35$mediaProperti4.signalingState) || ((_this35$mediaProperti5 = _this35.mediaProperties.webrtcMediaConnection) === null || _this35$mediaProperti5 === void 0 ? void 0 : (_this35$mediaProperti6 = _this35$mediaProperti5.mediaConnection) === null || _this35$mediaProperti6 === void 0 ? void 0 : (_this35$mediaProperti7 = _this35$mediaProperti6.pc) === null || _this35$mediaProperti7 === void 0 ? void 0 : _this35$mediaProperti7.signalingState) || 'unknown',
+          connectionState: ((_this35$mediaProperti8 = _this35.mediaProperties.webrtcMediaConnection) === null || _this35$mediaProperti8 === void 0 ? void 0 : (_this35$mediaProperti9 = _this35$mediaProperti8.multistreamConnection) === null || _this35$mediaProperti9 === void 0 ? void 0 : (_this35$mediaProperti10 = _this35$mediaProperti9.pc) === null || _this35$mediaProperti10 === void 0 ? void 0 : (_this35$mediaProperti11 = _this35$mediaProperti10.pc) === null || _this35$mediaProperti11 === void 0 ? void 0 : _this35$mediaProperti11.connectionState) || ((_this35$mediaProperti12 = _this35.mediaProperties.webrtcMediaConnection) === null || _this35$mediaProperti12 === void 0 ? void 0 : (_this35$mediaProperti13 = _this35$mediaProperti12.mediaConnection) === null || _this35$mediaProperti13 === void 0 ? void 0 : (_this35$mediaProperti14 = _this35$mediaProperti13.pc) === null || _this35$mediaProperti14 === void 0 ? void 0 : _this35$mediaProperti14.connectionState) || 'unknown',
+          iceConnectionState: ((_this35$mediaProperti15 = _this35.mediaProperties.webrtcMediaConnection) === null || _this35$mediaProperti15 === void 0 ? void 0 : (_this35$mediaProperti16 = _this35$mediaProperti15.multistreamConnection) === null || _this35$mediaProperti16 === void 0 ? void 0 : (_this35$mediaProperti17 = _this35$mediaProperti16.pc) === null || _this35$mediaProperti17 === void 0 ? void 0 : (_this35$mediaProperti18 = _this35$mediaProperti17.pc) === null || _this35$mediaProperti18 === void 0 ? void 0 : _this35$mediaProperti18.iceConnectionState) || ((_this35$mediaProperti19 = _this35.mediaProperties.webrtcMediaConnection) === null || _this35$mediaProperti19 === void 0 ? void 0 : (_this35$mediaProperti20 = _this35$mediaProperti19.mediaConnection) === null || _this35$mediaProperti20 === void 0 ? void 0 : (_this35$mediaProperti21 = _this35$mediaProperti20.pc) === null || _this35$mediaProperti21 === void 0 ? void 0 : _this35$mediaProperti21.iceConnectionState) || 'unknown'
         });
 
         // Clean up stats analyzer, peer connection, and turn off listeners
-        var stopStatsAnalyzer = _this41.statsAnalyzer ? _this41.statsAnalyzer.stopAnalyzer() : _promise.default.resolve();
+        var stopStatsAnalyzer = _this35.statsAnalyzer ? _this35.statsAnalyzer.stopAnalyzer() : _promise.default.resolve();
         return stopStatsAnalyzer.then(function () {
-          _this41.statsAnalyzer = null;
-          if (_this41.mediaProperties.webrtcMediaConnection) {
-            _this41.closePeerConnections();
-            _this41.unsetPeerConnections();
+          _this35.statsAnalyzer = null;
+          if (_this35.mediaProperties.webrtcMediaConnection) {
+            _this35.closePeerConnections();
+            _this35.unsetPeerConnections();
           }
           _loggerProxy.default.logger.error("".concat(LOG_HEADER, " Error adding media failed to initiate PC and send request, "), error);
 
           // Upload logs on error while adding media
-          _triggerProxy.default.trigger(_this41, {
+          _triggerProxy.default.trigger(_this35, {
             file: 'meeting/index',
             function: 'addMedia'
-          }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this41);
+          }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this35);
           if (error instanceof _internalMediaCore.Errors.SdpError) {
-            _this41.leave({
+            _this35.leave({
               reason: _constants.MEETING_REMOVED_REASON.MEETING_CONNECTION_FAILED
             });
           }
@@ -5403,7 +4952,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "enqueueMediaUpdate",
     value: function enqueueMediaUpdate(mediaUpdateType, options) {
-      var _this42 = this;
+      var _this36 = this;
       if (mediaUpdateType === MEDIA_UPDATE_TYPE.LAMBDA && typeof (options === null || options === void 0 ? void 0 : options.lambda) !== 'function') {
         return _promise.default.reject(new Error('lambda must be specified when enqueuing MEDIA_UPDATE_TYPE.LAMBDA'));
       }
@@ -5416,9 +4965,9 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           options: options
         };
         _loggerProxy.default.logger.log("Meeting:index#enqueueMediaUpdate --> enqueuing media update type=".concat(mediaUpdateType));
-        _this42.queuedMediaUpdates.push(queueItem);
+        _this36.queuedMediaUpdates.push(queueItem);
         if (canUpdateMediaNow) {
-          _this42.processNextQueuedMediaUpdate();
+          _this36.processNextQueuedMediaUpdate();
         }
       });
     }
@@ -5433,367 +4982,93 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
     key: "updateMedia",
     value:
     /**
-     * A confluence of updateAudio, updateVideo, and updateShare
-     * this function re-establishes all of the media streams with new options
-     * @param {Object} options
-     * @param {MediaStream} options.localStream
-     * @param {MediaStream} options.localShare
-     * @param {MediaDirection} options.mediaSettings
-     * @returns {Promise}
-     * @public
-     * @memberof Meeting
-     */
-    function updateMedia() {
-      var _this43 = this;
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var LOG_HEADER = 'Meeting:index#updateMedia -->';
-      if (!this.canUpdateMedia()) {
-        return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.ALL, options);
-      }
-      if (this.isMultistream) {
-        var _options$mediaSetting, _options$mediaSetting2;
-        var audioEnabled = ((_options$mediaSetting = options.mediaSettings) === null || _options$mediaSetting === void 0 ? void 0 : _options$mediaSetting.sendAudio) || ((_options$mediaSetting2 = options.mediaSettings) === null || _options$mediaSetting2 === void 0 ? void 0 : _options$mediaSetting2.receiveAudio);
-        return this.mediaProperties.webrtcMediaConnection.enableMultistreamAudio(audioEnabled);
-      }
-      var localStream = options.localStream,
-        localShare = options.localShare,
-        mediaSettings = options.mediaSettings;
-      var previousSendShareStatus = this.mediaProperties.mediaDirection.sendShare;
-      if (!this.mediaProperties.webrtcMediaConnection) {
-        return _promise.default.reject(new Error('media connection not established, call addMedia() first'));
-      }
-      return _util.default.validateOptions(options).then(function () {
-        return _this43.preMedia(localStream, localShare, mediaSettings);
-      }).then(function () {
-        return _this43.mediaProperties.webrtcMediaConnection.update({
-          localTracks: {
-            audio: _this43.mediaProperties.mediaDirection.sendAudio ? _this43.mediaProperties.audioTrack.underlyingTrack : null,
-            video: _this43.mediaProperties.mediaDirection.sendVideo ? _this43.mediaProperties.videoTrack.underlyingTrack : null,
-            screenShareVideo: _this43.mediaProperties.mediaDirection.sendShare ? _this43.mediaProperties.shareTrack.underlyingTrack : null
-          },
-          direction: {
-            audio: _media.default.getDirection(_this43.mediaProperties.mediaDirection.receiveAudio, _this43.mediaProperties.mediaDirection.sendAudio),
-            video: _media.default.getDirection(_this43.mediaProperties.mediaDirection.receiveVideo, _this43.mediaProperties.mediaDirection.sendVideo),
-            screenShareVideo: _media.default.getDirection(_this43.mediaProperties.mediaDirection.receiveShare, _this43.mediaProperties.mediaDirection.sendShare)
-          },
-          remoteQualityLevel: _this43.mediaProperties.remoteQualityLevel
-        }).then(function () {
-          _loggerProxy.default.logger.info("".concat(LOG_HEADER, " webrtcMediaConnection.update done"));
-        }).catch(function (error) {
-          _loggerProxy.default.logger.error("".concat(LOG_HEADER, " Error updatedMedia, "), error);
-          _metrics.default.sendBehavioralMetric(_constants2.default.UPDATE_MEDIA_FAILURE, {
-            correlation_id: _this43.correlationId,
-            locus_id: _this43.locusUrl.split('/').pop(),
-            reason: error.message,
-            stack: error.stack
-          });
-          throw error;
-        })
-        // todo: the following code used to be called always after sending the roap message with the new SDP
-        // now it's called independently from the roap message (so might be before it), check if that's OK
-        // if not, ensure it's called after (now it's called after roap message is sent out, but we're not
-        // waiting for sendRoapMediaRequest() to be resolved)
-        .then(function () {
-          return _this43.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-            lambda: function lambda() {
-              return _promise.default.resolve().then(function () {
-                return _this43.checkForStopShare(mediaSettings.sendShare, previousSendShareStatus);
-              }).then(function (startShare) {
-                // This is a special case if we do an /floor grant followed by /media
-                // we actually get a OFFER from the server and a GLAR condition happens
-                if (startShare) {
-                  // We are assuming that the clients are connected when doing an update
-                  return _this43.requestScreenShareFloor();
-                }
-                return _promise.default.resolve();
-              });
-            }
-          });
-        });
-      });
-    }
-
-    /**
-     * Update the main audio track with new parameters
-     *
-     * NOTE: this method can only be used with transcoded meetings, for multistream meetings use publishTrack()
+     * Updates the media connection - it allows to enable/disable all audio/video/share in the meeting.
+     * This does not affect the published tracks, so for example if a microphone track is published and
+     * updateMedia({audioEnabled: false}) is called, the audio will not be sent or received anymore,
+     * but the track's "published" state is not changed and when updateMedia({audioEnabled: true}) is called,
+     * the sending of the audio from the same track will resume.
      *
      * @param {Object} options
-     * @param {boolean} options.sendAudio
-     * @param {boolean} options.receiveAudio
-     * @param {MediaStream} options.stream Stream that contains the audio track to update
+     * @param {boolean} options.audioEnabled [optional] enables/disables receiving and sending of main audio in the meeting
+     * @param {boolean} options.videoEnabled [optional] enables/disables receiving and sending of main video in the meeting
+     * @param {boolean} options.shareEnabled [optional] enables/disables receiving and sending of screen share in the meeting
      * @returns {Promise}
      * @public
      * @memberof Meeting
      */
-  }, {
-    key: "updateAudio",
-    value: function () {
-      var _updateAudio = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(options) {
-        var _this44 = this;
-        var sendAudio, receiveAudio, stream, track;
-        return _regenerator.default.wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+    function () {
+      var _updateMedia = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee16(options) {
+        var audioEnabled, videoEnabled, receiveShare;
+        return _regenerator.default.wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              if (!this.isMultistream) {
-                _context9.next = 2;
+              this.checkMediaConnection();
+              audioEnabled = options.audioEnabled, videoEnabled = options.videoEnabled, receiveShare = options.receiveShare;
+              _loggerProxy.default.logger.log("Meeting:index#updateMedia --> called with options=".concat((0, _stringify.default)(options)));
+              if (this.canUpdateMedia()) {
+                _context16.next = 5;
                 break;
               }
-              throw new Error('updateAudio() is not supported with multistream, use publishTracks/unpublishTracks instead');
-            case 2:
-              if (this.canUpdateMedia()) {
-                _context9.next = 4;
+              return _context16.abrupt("return", this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.UPDATE_MEDIA, options));
+            case 5:
+              if (!this.isMultistream) {
+                _context16.next = 10;
                 break;
               }
-              return _context9.abrupt("return", this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.AUDIO, options));
-            case 4:
-              sendAudio = options.sendAudio, receiveAudio = options.receiveAudio, stream = options.stream;
-              track = _util.default.getTrack(stream).audioTrack;
-              if (!(typeof sendAudio !== 'boolean' || typeof receiveAudio !== 'boolean')) {
-                _context9.next = 8;
+              if (!(videoEnabled !== undefined)) {
+                _context16.next = 8;
                 break;
               }
-              return _context9.abrupt("return", _promise.default.reject(new _parameter.default('Pass sendAudio and receiveAudio parameter')));
+              throw new Error('enabling/disabling video in a meeting is not supported for multistream, it can only be done upfront when calling addMedia()');
             case 8:
-              if (this.mediaProperties.webrtcMediaConnection) {
-                _context9.next = 10;
+              if (!(receiveShare !== undefined)) {
+                _context16.next = 10;
                 break;
               }
-              return _context9.abrupt("return", _promise.default.reject(new Error('media connection not established, call addMedia() first')));
+              throw new Error('toggling receiveShare in a multistream meeting is not supported, to control receiving screen share call meeting.remoteMediaManager.setLayout() with appropriate layout');
             case 10:
-              return _context9.abrupt("return", _util.default.validateOptions({
-                sendAudio: sendAudio,
-                localStream: stream
-              }).then(function () {
-                return _this44.mediaProperties.webrtcMediaConnection.update({
-                  localTracks: {
-                    audio: track
-                  },
-                  direction: {
-                    audio: _media.default.getDirection(receiveAudio, sendAudio),
-                    video: _media.default.getDirection(_this44.mediaProperties.mediaDirection.receiveVideo, _this44.mediaProperties.mediaDirection.sendVideo),
-                    screenShareVideo: _media.default.getDirection(_this44.mediaProperties.mediaDirection.receiveShare, _this44.mediaProperties.mediaDirection.sendShare)
-                  },
-                  remoteQualityLevel: _this44.mediaProperties.remoteQualityLevel
-                });
-              }).then(function () {
-                _this44.setLocalAudioTrack(track);
-                // todo: maybe this.mediaProperties.mediaDirection could be removed? it's duplicating stuff from webrtcMediaConnection
-                _this44.mediaProperties.mediaDirection.sendAudio = sendAudio;
-                _this44.mediaProperties.mediaDirection.receiveAudio = receiveAudio;
-
-                // audio state could be undefined if you have not sent audio before
-                _this44.audio = _this44.audio || (0, _muteState.createMuteState)(_constants.AUDIO, _this44, _this44.mediaProperties.mediaDirection, true);
-              }));
-            case 11:
-            case "end":
-              return _context9.stop();
-          }
-        }, _callee9, this);
-      }));
-      function updateAudio(_x5) {
-        return _updateAudio.apply(this, arguments);
-      }
-      return updateAudio;
-    }()
-    /**
-     * Update the main video track with new parameters
-     *
-     * NOTE: this method can only be used with transcoded meetings, for multistream meetings use publishTrack()
-     *
-     * @param {Object} options
-     * @param {boolean} options.sendVideo
-     * @param {boolean} options.receiveVideo
-     * @param {MediaStream} options.stream Stream that contains the video track to update
-     * @returns {Promise}
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "updateVideo",
-    value: function updateVideo(options) {
-      var _this45 = this;
-      if (this.isMultistream) {
-        throw new Error('updateVideo() is not supported with multistream, use publishTracks/unpublishTracks instead');
-      }
-      if (!this.canUpdateMedia()) {
-        return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.VIDEO, options);
-      }
-      var sendVideo = options.sendVideo,
-        receiveVideo = options.receiveVideo,
-        stream = options.stream;
-      var track = _util.default.getTrack(stream).videoTrack;
-      if (typeof sendVideo !== 'boolean' || typeof receiveVideo !== 'boolean') {
-        return _promise.default.reject(new _parameter.default('Pass sendVideo and receiveVideo parameter'));
-      }
-      if (!this.mediaProperties.webrtcMediaConnection) {
-        return _promise.default.reject(new Error('media connection not established, call addMedia() first'));
-      }
-      return _util.default.validateOptions({
-        sendVideo: sendVideo,
-        localStream: stream
-      }).then(function () {
-        return _this45.mediaProperties.webrtcMediaConnection.update({
-          localTracks: {
-            video: track
-          },
-          direction: {
-            audio: _media.default.getDirection(_this45.mediaProperties.mediaDirection.receiveAudio, _this45.mediaProperties.mediaDirection.sendAudio),
-            video: _media.default.getDirection(receiveVideo, sendVideo),
-            screenShareVideo: _media.default.getDirection(_this45.mediaProperties.mediaDirection.receiveShare, _this45.mediaProperties.mediaDirection.sendShare)
-          },
-          remoteQualityLevel: _this45.mediaProperties.remoteQualityLevel
-        });
-      }).then(function () {
-        _this45.setLocalVideoTrack(track);
-        _this45.mediaProperties.mediaDirection.sendVideo = sendVideo;
-        _this45.mediaProperties.mediaDirection.receiveVideo = receiveVideo;
-
-        // video state could be undefined if you have not sent video before
-        _this45.video = _this45.video || (0, _muteState.createMuteState)(_constants.VIDEO, _this45, _this45.mediaProperties.mediaDirection, true);
-      });
-    }
-
-    /**
-     * Internal function when stopping a share stream, cleanup
-     * @param {boolean} sendShare
-     * @param {boolean} previousShareStatus
-     * @returns {Promise}
-     * @private
-     * @memberof Meeting
-     */
-  }, {
-    key: "checkForStopShare",
-    value: function checkForStopShare(sendShare, previousShareStatus) {
-      if (sendShare && !previousShareStatus) {
-        // When user starts sharing
-        return _promise.default.resolve(true);
-      }
-      if (!sendShare && previousShareStatus) {
-        // When user stops sharing
-        return this.releaseScreenShareFloor().then(function () {
-          return _promise.default.resolve(false);
-        });
-      }
-      return _promise.default.resolve();
-    }
-
-    /**
-     * Update the share streams, can be used to start sharing
-     *
-     * NOTE: this method can only be used with transcoded meetings, for multistream meetings use publishTrack()
-     *
-     * @param {Object} options
-     * @param {boolean} options.sendShare
-     * @param {boolean} options.receiveShare
-     * @returns {Promise}
-     * @public
-     * @memberof Meeting
-     */
-  }, {
-    key: "updateShare",
-    value: function updateShare(options) {
-      var _this46 = this;
-      if (this.isMultistream) {
-        throw new Error('updateShare() is not supported with multistream, use publishTracks/unpublishTracks instead');
-      }
-      if (!options.skipSignalingCheck && !this.canUpdateMedia()) {
-        return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE, options);
-      }
-      var sendShare = options.sendShare,
-        receiveShare = options.receiveShare,
-        stream = options.stream;
-      var track = _util.default.getTrack(stream).videoTrack;
-      if (typeof sendShare !== 'boolean' || typeof receiveShare !== 'boolean') {
-        return _promise.default.reject(new _parameter.default('Pass sendShare and receiveShare parameter'));
-      }
-      if (!this.mediaProperties.webrtcMediaConnection) {
-        return _promise.default.reject(new Error('media connection not established, call addMedia() first'));
-      }
-      var previousSendShareStatus = this.mediaProperties.mediaDirection.sendShare;
-      this.setLocalShareTrack(track);
-      return _util.default.validateOptions({
-        sendShare: sendShare,
-        localShare: stream
-      }).then(function () {
-        return _this46.checkForStopShare(sendShare, previousSendShareStatus);
-      }).then(function (startShare) {
-        return _this46.mediaProperties.webrtcMediaConnection.update({
-          localTracks: {
-            screenShareVideo: track
-          },
-          direction: {
-            audio: _media.default.getDirection(_this46.mediaProperties.mediaDirection.receiveAudio, _this46.mediaProperties.mediaDirection.sendAudio),
-            video: _media.default.getDirection(_this46.mediaProperties.mediaDirection.receiveVideo, _this46.mediaProperties.mediaDirection.sendVideo),
-            screenShareVideo: _media.default.getDirection(receiveShare, sendShare)
-          },
-          remoteQualityLevel: _this46.mediaProperties.remoteQualityLevel
-        }).then(function () {
-          return _this46.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-            lambda: function () {
-              var _lambda = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
-                return _regenerator.default.wrap(function _callee10$(_context10) {
-                  while (1) switch (_context10.prev = _context10.next) {
-                    case 0:
-                      if (!startShare) {
-                        _context10.next = 2;
-                        break;
-                      }
-                      return _context10.abrupt("return", _this46.requestScreenShareFloor());
-                    case 2:
-                      return _context10.abrupt("return", undefined);
-                    case 3:
-                    case "end":
-                      return _context10.stop();
-                  }
-                }, _callee10);
-              }));
-              function lambda() {
-                return _lambda.apply(this, arguments);
+              if (audioEnabled !== undefined) {
+                this.mediaProperties.mediaDirection.sendAudio = audioEnabled;
+                this.mediaProperties.mediaDirection.receiveAudio = audioEnabled;
+                this.audio.enable(this, audioEnabled);
+              }
+              if (videoEnabled !== undefined) {
+                this.mediaProperties.mediaDirection.sendVideo = videoEnabled;
+                this.mediaProperties.mediaDirection.receiveVideo = videoEnabled;
+                this.video.enable(this, videoEnabled);
+              }
+              if (receiveShare !== undefined) {
+                this.mediaProperties.mediaDirection.receiveShare = receiveShare;
+              }
+              if (!this.isMultistream) {
+                _context16.next = 19;
+                break;
               }
-              return lambda;
-            }()
-          });
-        });
-      }).then(function () {
-        _this46.mediaProperties.mediaDirection.sendShare = sendShare;
-        _this46.mediaProperties.mediaDirection.receiveShare = receiveShare;
-      }).catch(function (error) {
-        _this46.unsetLocalShareTrack();
-        throw error;
-      });
-    }
-
-    /**
-     * Do all the attach media pre set up before executing the actual attach
-     * @param {MediaStream} localStream
-     * @param {MediaStream} localShare
-     * @param {MediaDirection} mediaSettings
-     * @returns {undefined}
-     * @private
-     * @memberof Meeting
-     */
-  }, {
-    key: "preMedia",
-    value: function preMedia(localStream, localShare, mediaSettings) {
-      // eslint-disable-next-line no-warning-comments
-      // TODO wire into default config. There's currently an issue with the stateless plugin or how we register
-      // @ts-ignore - config coming from registerPlugin
-      this.mediaProperties.setMediaDirection((0, _assign.default)(this.config.mediaSettings, mediaSettings));
-
-      // for multistream, this.audio and this.video are created when publishTracks() is called
-      if (!this.isMultistream) {
-        this.audio = this.audio || (0, _muteState.createMuteState)(_constants.AUDIO, this, this.mediaProperties.mediaDirection, true);
-        this.video = this.video || (0, _muteState.createMuteState)(_constants.VIDEO, this, this.mediaProperties.mediaDirection, true);
-      }
-      // Validation is already done in addMedia so no need to check if the lenght is greater then 0
-      this.setLocalTracks(localStream);
-      if (this.isMultistream && localShare) {
-        throw new Error('calling addMedia() with localShare stream is not supported when using multistream');
+              if (!(audioEnabled !== undefined)) {
+                _context16.next = 17;
+                break;
+              }
+              _context16.next = 17;
+              return this.mediaProperties.webrtcMediaConnection.enableMultistreamAudio(audioEnabled);
+            case 17:
+              _context16.next = 21;
+              break;
+            case 19:
+              _context16.next = 21;
+              return this.updateTranscodedMediaConnection();
+            case 21:
+              return _context16.abrupt("return", undefined);
+            case 22:
+            case "end":
+              return _context16.stop();
+          }
+        }, _callee16, this);
+      }));
+      function updateMedia(_x12) {
+        return _updateMedia.apply(this, arguments);
       }
-      this.setLocalShareTrack(_util.default.getTrack(localShare).videoTrack);
-    }
-
+      return updateMedia;
+    }()
     /**
      * Acknowledge the meeting, outgoing or incoming
      * @param {String} type
@@ -5804,7 +5079,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "acknowledge",
     value: function acknowledge(type) {
-      var _this47 = this;
+      var _this37 = this;
       if (!type) {
         return _promise.default.reject(new _parameter.default('Type must be set to acknowledge the meeting.'));
       }
@@ -5816,10 +5091,10 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         }).then(function (response) {
           return _promise.default.resolve(response);
         }).then(function (response) {
-          _this47.meetingFiniteStateMachine.ring(type);
+          _this37.meetingFiniteStateMachine.ring(type);
           _metrics.default.postEvent({
             event: _config.eventType.ALERT_DISPLAYED,
-            meeting: _this47
+            meeting: _this37
           });
           return _promise.default.resolve({
             response: response
@@ -5843,12 +5118,12 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "decline",
     value: function decline(reason) {
-      var _this48 = this;
+      var _this38 = this;
       return _util.default.declineMeeting(this, reason).then(function (decline) {
-        _this48.meetingFiniteStateMachine.decline();
+        _this38.meetingFiniteStateMachine.decline();
         return _promise.default.resolve(decline);
       }).catch(function (error) {
-        _this48.meetingFiniteStateMachine.fail(error);
+        _this38.meetingFiniteStateMachine.fail(error);
         return _promise.default.reject(error);
       });
     }
@@ -5864,7 +5139,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "leave",
     value: function leave() {
-      var _this49 = this;
+      var _this39 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var leaveReason = options.reason || _constants.MEETING_REMOVED_REASON.CLIENT_LEAVE_REQUEST;
       _metrics.default.postEvent({
@@ -5878,39 +5153,39 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       });
       _loggerProxy.default.logger.log('Meeting:index#leave --> Leaving a meeting');
       return _util.default.leaveMeeting(this, options).then(function (leave) {
-        _this49.meetingFiniteStateMachine.leave();
-        _this49.clearMeetingData();
+        _this39.meetingFiniteStateMachine.leave();
+        _this39.clearMeetingData();
 
         // upload logs on leave irrespective of meeting delete
-        _triggerProxy.default.trigger(_this49, {
+        _triggerProxy.default.trigger(_this39, {
           file: 'meeting/index',
           function: 'leave'
-        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this49);
+        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this39);
 
         // TODO: more testing before we remove this code, we are not sure the scenarios for destroy here
-        if (_this49.wirelessShare || _this49.guest) {
+        if (_this39.wirelessShare || _this39.guest) {
           // If screen sharing clean the meeting object
-          _triggerProxy.default.trigger(_this49, {
+          _triggerProxy.default.trigger(_this39, {
             file: 'meeting/index',
             function: 'leave'
           }, _constants.EVENTS.DESTROY_MEETING, {
             reason: options.reason,
-            meetingId: _this49.id
+            meetingId: _this39.id
           });
         }
         _loggerProxy.default.logger.log('Meeting:index#leave --> LEAVE REASON ', leaveReason);
         return leave;
       }).catch(function (error) {
-        _this49.meetingFiniteStateMachine.fail(error);
+        _this39.meetingFiniteStateMachine.fail(error);
         _loggerProxy.default.logger.error('Meeting:index#leave --> Failed to leave ', error);
         // upload logs on leave irrespective of meeting delete
-        _triggerProxy.default.trigger(_this49, {
+        _triggerProxy.default.trigger(_this39, {
           file: 'meeting/index',
           function: 'leave'
-        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this49);
+        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this39);
         _metrics.default.sendBehavioralMetric(_constants2.default.MEETING_LEAVE_FAILURE, {
-          correlation_id: _this49.correlationId,
-          locus_id: _this49.locusUrl.split('/').pop(),
+          correlation_id: _this39.correlationId,
+          locus_id: _this39.locusUrl.split('/').pop(),
           reason: error.message,
           stack: error.stack,
           code: error.code
@@ -5930,7 +5205,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "startWhiteboardShare",
     value: function startWhiteboardShare(channelUrl, resourceToken) {
-      var _this50 = this;
+      var _this40 = this;
       var whiteboard = this.locusInfo.mediaShares.find(function (element) {
         return element.name === 'whiteboard';
       });
@@ -5953,13 +5228,13 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           body.resourceToken = resourceToken;
         }
         return this.meetingRequest.changeMeetingFloor(body).then(function () {
-          _this50.isSharing = false;
+          _this40.isSharing = false;
           return _promise.default.resolve();
         }).catch(function (error) {
           _loggerProxy.default.logger.error('Meeting:index#startWhiteboardShare --> Error ', error);
           _metrics.default.sendBehavioralMetric(_constants2.default.MEETING_START_WHITEBOARD_SHARE_FAILURE, {
-            correlation_id: _this50.correlationId,
-            locus_id: _this50.locusUrl.split('/').pop(),
+            correlation_id: _this40.correlationId,
+            locus_id: _this40.locusUrl.split('/').pop(),
             reason: error.message,
             stack: error.stack,
             board: {
@@ -5982,7 +5257,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "stopWhiteboardShare",
     value: function stopWhiteboardShare(channelUrl) {
-      var _this51 = this;
+      var _this41 = this;
       var whiteboard = this.locusInfo.mediaShares.find(function (element) {
         return element.name === 'whiteboard';
       });
@@ -6001,8 +5276,8 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           _metrics.default.sendBehavioralMetric(
           // @ts-ignore - check if STOP_WHITEBOARD_SHARE_FAILURE exists
           _constants2.default.STOP_WHITEBOARD_SHARE_FAILURE, {
-            correlation_id: _this51.correlationId,
-            locus_id: _this51.locusUrl.split('/').pop(),
+            correlation_id: _this41.correlationId,
+            locus_id: _this41.locusUrl.split('/').pop(),
             reason: error.message,
             stack: error.stack,
             board: {
@@ -6024,55 +5299,62 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "requestScreenShareFloor",
     value: function requestScreenShareFloor() {
-      var _this52 = this;
-      var content = this.locusInfo.mediaShares.find(function (element) {
-        return element.name === _constants.CONTENT;
-      });
-      if (content && this.shareStatus !== _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE) {
-        _metrics.default.postEvent({
-          event: _config.eventType.SHARE_INITIATED,
-          meeting: this
+      var _this42 = this;
+      if (!this.mediaProperties.shareTrack || !this.mediaProperties.mediaDirection.sendShare) {
+        _loggerProxy.default.logger.log("Meeting:index#requestScreenShareFloor --> NOT requesting floor, because we don't have the share track anymore (shareTrack=".concat(this.mediaProperties.shareTrack ? 'yes' : 'no', ", sendShare=").concat(this.mediaProperties.mediaDirection.sendShare, ")"));
+        return _promise.default.resolve({});
+      }
+      if (this.state === _constants.MEETING_STATE.STATES.JOINED) {
+        var content = this.locusInfo.mediaShares.find(function (element) {
+          return element.name === _constants.CONTENT;
         });
-        return this.meetingRequest.changeMeetingFloor({
-          disposition: _constants.FLOOR_ACTION.GRANTED,
-          personUrl: this.locusInfo.self.url,
-          deviceUrl: this.deviceUrl,
-          uri: content.url,
-          resourceUrl: this.resourceUrl,
-          annotationInfo: this.annotationInfo
-        }).then(function () {
-          _this52.isSharing = true;
-          return _promise.default.resolve();
-        }).catch(function (error) {
-          _loggerProxy.default.logger.error('Meeting:index#share --> Error ', error);
-          _metrics.default.sendBehavioralMetric(_constants2.default.MEETING_SHARE_FAILURE, {
-            correlation_id: _this52.correlationId,
-            locus_id: _this52.locusUrl.split('/').pop(),
-            reason: error.message,
-            stack: error.stack
+        if (content && this.shareStatus !== _constants.SHARE_STATUS.LOCAL_SHARE_ACTIVE) {
+          _metrics.default.postEvent({
+            event: _config.eventType.SHARE_INITIATED,
+            meeting: this
           });
-          return _promise.default.reject(error);
-        });
+          return this.meetingRequest.changeMeetingFloor({
+            disposition: _constants.FLOOR_ACTION.GRANTED,
+            personUrl: this.locusInfo.self.url,
+            deviceUrl: this.deviceUrl,
+            uri: content.url,
+            resourceUrl: this.resourceUrl,
+            annotationInfo: this.annotationInfo
+          }).then(function () {
+            _this42.isSharing = true;
+            return _promise.default.resolve();
+          }).catch(function (error) {
+            _loggerProxy.default.logger.error('Meeting:index#share --> Error ', error);
+            _metrics.default.sendBehavioralMetric(_constants2.default.MEETING_SHARE_FAILURE, {
+              correlation_id: _this42.correlationId,
+              locus_id: _this42.locusUrl.split('/').pop(),
+              reason: error.message,
+              stack: error.stack
+            });
+            return _promise.default.reject(error);
+          });
+        }
+        return _promise.default.reject(new _parameter.default('Cannot share without content.'));
       }
-      return _promise.default.reject(new _parameter.default('Cannot share without content.'));
+      this.floorGrantPending = true;
+      return _promise.default.resolve({});
     }
 
     /**
-     * Stops the screen share
-     * @returns {Promise} see #updateShare
-     * @public
-     * @memberof Meeting
+     * Requests screen share floor if such request is pending.
+     * It should be called whenever meeting state changes to JOINED
+     *
+     * @returns {void}
      */
-    // Internal only, temporarily allows optional params
-    // eslint-disable-next-line valid-jsdoc
   }, {
-    key: "stopShare",
-    value: function stopShare() {
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      return this.updateShare(_objectSpread({
-        sendShare: false,
-        receiveShare: this.mediaProperties.mediaDirection.receiveShare
-      }, options));
+    key: "requestScreenShareFloorIfPending",
+    value: function requestScreenShareFloorIfPending() {
+      var _this43 = this;
+      if (this.floorGrantPending && this.state === _constants.MEETING_STATE.STATES.JOINED) {
+        this.requestScreenShareFloor().then(function () {
+          _this43.floorGrantPending = false;
+        });
+      }
     }
 
     /**
@@ -6084,16 +5366,17 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "releaseScreenShareFloor",
     value: function releaseScreenShareFloor() {
-      var _this53 = this;
+      var _this44 = this;
       var content = this.locusInfo.mediaShares.find(function (element) {
         return element.name === _constants.CONTENT;
       });
-      if (content && this.mediaProperties.mediaDirection.sendShare) {
+      if (content) {
+        var _content$floor;
         _metrics.default.postEvent({
           event: _config.eventType.SHARE_STOPPED,
           meeting: this
         });
-        if (content.floor.beneficiary.id !== this.selfId) {
+        if (((_content$floor = content.floor) === null || _content$floor === void 0 ? void 0 : _content$floor.beneficiary.id) !== this.selfId) {
           // remote participant started sharing and caused our sharing to stop, we don't want to send any floor action request in that case
           this.isSharing = false;
           return _promise.default.resolve();
@@ -6107,17 +5390,20 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         }).catch(function (error) {
           _loggerProxy.default.logger.error('Meeting:index#releaseScreenShareFloor --> Error ', error);
           _metrics.default.sendBehavioralMetric(_constants2.default.STOP_FLOOR_REQUEST_FAILURE, {
-            correlation_id: _this53.correlationId,
-            locus_id: _this53.locusUrl.split('/').pop(),
+            correlation_id: _this44.correlationId,
+            locus_id: _this44.locusUrl.split('/').pop(),
             reason: error.message,
             stack: error.stack
           });
           return _promise.default.reject(error);
         }).finally(function () {
-          _this53.isSharing = false;
+          _this44.isSharing = false;
         });
       }
-      return _promise.default.reject(new _parameter.default('Cannot stop share without content'));
+
+      // according to Locus there is no content, so we don't need to release the floor (it's probably already been released)
+      this.isSharing = false;
+      return _promise.default.resolve();
     }
 
     /**
@@ -6287,14 +5573,14 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "changeVideoLayout",
     value: function changeVideoLayout(layoutType) {
-      var _this54 = this;
+      var _this45 = this;
       var renderInfo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var main = renderInfo.main,
         content = renderInfo.content;
-      var _this$mediaProperties7 = this.mediaProperties,
-        mediaDirection = _this$mediaProperties7.mediaDirection,
-        remoteShare = _this$mediaProperties7.remoteShare,
-        remoteVideoTrack = _this$mediaProperties7.remoteVideoTrack;
+      var _this$mediaProperties4 = this.mediaProperties,
+        mediaDirection = _this$mediaProperties4.mediaDirection,
+        remoteShare = _this$mediaProperties4.remoteShare,
+        remoteVideoTrack = _this$mediaProperties4.remoteVideoTrack;
       var layoutInfo = (0, _cloneDeep2.default)(this.lastVideoLayoutInfo);
 
       // TODO: We need a real time value for Audio, Video and Share send indicator
@@ -6341,7 +5627,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       }
       this.lastVideoLayoutInfo = (0, _cloneDeep2.default)(layoutInfo);
       this.locusInfo.once(_constants.LOCUSINFO.EVENTS.CONTROLS_MEETING_LAYOUT_UPDATED, function (envelope) {
-        _triggerProxy.default.trigger(_this54, {
+        _triggerProxy.default.trigger(_this45, {
           file: 'meeting/index',
           function: 'changeVideoLayout'
         }, _constants.EVENT_TRIGGERS.MEETING_CONTROLS_LAYOUT_UPDATE, {
@@ -6360,69 +5646,6 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
       });
     }
 
-    /**
-     * Sets the quality of the local video stream
-     * @param {String} level {LOW|MEDIUM|HIGH}
-     * @returns {Promise<MediaStream>} localStream
-     */
-  }, {
-    key: "setLocalVideoQuality",
-    value: function setLocalVideoQuality(level) {
-      var _this55 = this;
-      _loggerProxy.default.logger.log("Meeting:index#setLocalVideoQuality --> Setting quality to ".concat(level));
-      if (!_constants.VIDEO_RESOLUTIONS[level]) {
-        return this.rejectWithErrorLog("Meeting:index#setLocalVideoQuality --> ".concat(level, " not defined"));
-      }
-      if (!this.mediaProperties.mediaDirection.sendVideo) {
-        return this.rejectWithErrorLog('Meeting:index#setLocalVideoQuality --> unable to change video quality, sendVideo is disabled');
-      }
-
-      // If level is already the same, don't do anything
-      if (level === this.mediaProperties.localQualityLevel) {
-        _loggerProxy.default.logger.warn("Meeting:index#setLocalQualityLevel --> Quality already set to ".concat(level));
-        return _promise.default.resolve();
-      }
-
-      // Set the quality level in properties
-      this.mediaProperties.setLocalQualityLevel(level);
-      var mediaDirection = {
-        sendAudio: this.mediaProperties.mediaDirection.sendAudio,
-        sendVideo: this.mediaProperties.mediaDirection.sendVideo,
-        sendShare: this.mediaProperties.mediaDirection.sendShare
-      };
-
-      // When changing local video quality level
-      // Need to stop current track first as chrome doesn't support resolution upscaling(for eg. changing 480p to 720p)
-      // Without feeding it a new track
-      // open bug link: https://bugs.chromium.org/p/chromium/issues/detail?id=943469
-      if (isBrowser('chrome') && this.mediaProperties.videoTrack) _media.default.stopTracks(this.mediaProperties.videoTrack);
-      return this.getMediaStreams(mediaDirection, _constants.VIDEO_RESOLUTIONS[level]).then( /*#__PURE__*/function () {
-        var _ref26 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(_ref25) {
-          var _ref27, localStream;
-          return _regenerator.default.wrap(function _callee11$(_context11) {
-            while (1) switch (_context11.prev = _context11.next) {
-              case 0:
-                _ref27 = (0, _slicedToArray2.default)(_ref25, 1), localStream = _ref27[0];
-                _context11.next = 3;
-                return _this55.updateVideo({
-                  sendVideo: true,
-                  receiveVideo: true,
-                  stream: localStream
-                });
-              case 3:
-                return _context11.abrupt("return", localStream);
-              case 4:
-              case "end":
-                return _context11.stop();
-            }
-          }, _callee11);
-        }));
-        return function (_x6) {
-          return _ref26.apply(this, arguments);
-        };
-      }());
-    }
-
     /**
      * Sets the quality level of the remote incoming media
      * @param {String} level {LOW|MEDIUM|HIGH}
@@ -6447,112 +5670,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
 
       // Set the quality level in properties
       this.mediaProperties.setRemoteQualityLevel(level);
-      return this.updateMedia({
-        mediaSettings: this.mediaProperties.mediaDirection
-      });
-    }
-
-    /**
-     * This is deprecated, please use setLocalVideoQuality for setting local and setRemoteQualityLevel for remote
-     * @param {String} level {LOW|MEDIUM|HIGH}
-     * @returns {Promise}
-     * @deprecated After FHD support
-     */
-  }, {
-    key: "setMeetingQuality",
-    value: function setMeetingQuality(level) {
-      var _this56 = this;
-      _loggerProxy.default.logger.log("Meeting:index#setMeetingQuality --> Setting quality to ".concat(level));
-      if (!_constants.QUALITY_LEVELS[level]) {
-        return this.rejectWithErrorLog("Meeting:index#setMeetingQuality --> ".concat(level, " not defined"));
-      }
-      var previousLevel = {
-        local: this.mediaProperties.localQualityLevel,
-        remote: this.mediaProperties.remoteQualityLevel
-      };
-
-      // If level is already the same, don't do anything
-      if (level === this.mediaProperties.localQualityLevel && level === this.mediaProperties.remoteQualityLevel) {
-        _loggerProxy.default.logger.warn("Meeting:index#setMeetingQuality --> Quality already set to ".concat(level));
-        return _promise.default.resolve();
-      }
-
-      // Determine the direction of our current media
-      var _this$mediaProperties8 = this.mediaProperties.mediaDirection,
-        receiveAudio = _this$mediaProperties8.receiveAudio,
-        receiveVideo = _this$mediaProperties8.receiveVideo,
-        sendVideo = _this$mediaProperties8.sendVideo;
-      return (sendVideo ? this.setLocalVideoQuality(level) : _promise.default.resolve()).then(function () {
-        return receiveAudio || receiveVideo ? _this56.setRemoteQualityLevel(level) : _promise.default.resolve();
-      }).catch(function (error) {
-        // From troubleshooting it seems that the stream itself doesn't change the max-fs if the peer connection isn't stable
-        _this56.mediaProperties.setLocalQualityLevel(previousLevel.local);
-        _this56.mediaProperties.setRemoteQualityLevel(previousLevel.remote);
-        _loggerProxy.default.logger.error("Meeting:index#setMeetingQuality --> ".concat(error.message));
-        _metrics.default.sendBehavioralMetric(_constants2.default.SET_MEETING_QUALITY_FAILURE, {
-          correlation_id: _this56.correlationId,
-          locus_id: _this56.locusUrl.split('/').pop(),
-          reason: error.message,
-          stack: error.stack
-        }, {
-          type: error.name
-        });
-        return _promise.default.reject(error);
-      });
-    }
-
-    /**
-     *
-     * NOTE: this method can only be used with transcoded meetings, for multistream use publishTrack()
-     *
-     * @param {Object} options parameter
-     * @param {Boolean} options.sendAudio send audio from the display share
-     * @param {Boolean} options.sendShare send video from the display share
-     * @param {Object} options.sharePreferences
-     * @param {MediaTrackConstraints} options.sharePreferences.shareConstraints constraints to apply to video
-     *   @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackConstraints}
-     * @param {Boolean} options.sharePreferences.highFrameRate if shareConstraints isn't provided, set default values based off of this boolean
-     * @returns {Promise}
-     */
-  }, {
-    key: "shareScreen",
-    value: function shareScreen() {
-      var _this57 = this;
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      _loggerProxy.default.logger.log('Meeting:index#shareScreen --> Getting local share');
-      var shareConstraints = _objectSpread({
-        sendShare: true,
-        sendAudio: false
-      }, options);
-
-      // @ts-ignore - config coming from registerPlugin
-      return _media.default.getDisplayMedia(shareConstraints, this.config).then(function (shareStream) {
-        return _this57.updateShare({
-          sendShare: true,
-          receiveShare: _this57.mediaProperties.mediaDirection.receiveShare,
-          stream: shareStream
-        });
-      }).catch(function (error) {
-        // Whenever there is a failure when trying to access a user's display
-        // report it as an Behavioral metric
-        // This gives visibility into common errors and can help
-        // with further troubleshooting
-
-        // This metrics will get erros for getDisplayMedia and share errors for now
-        // TODO: The getDisplayMedia errors need to be moved inside `media.getDisplayMedia`
-        var metricName = _constants2.default.GET_DISPLAY_MEDIA_FAILURE;
-        var data = {
-          correlation_id: _this57.correlationId,
-          locus_id: _this57.locusUrl.split('/').pop(),
-          reason: error.message,
-          stack: error.stack
-        };
-        var metadata = {
-          type: error.name
-        };
-        _metrics.default.sendBehavioralMetric(metricName, data, metadata);
-        throw new _media2.default('Unable to retrieve display media stream', error);
-      });
+      return this.updateTranscodedMediaConnection();
     }
 
     /**
@@ -6838,7 +5956,7 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "endMeetingForAll",
     value: function endMeetingForAll() {
-      var _this58 = this;
+      var _this46 = this;
       _metrics.default.postEvent({
         event: _config.eventType.LEAVE,
         meeting: this,
@@ -6853,25 +5971,25 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
         locus_id: this.locusId
       });
       return _util.default.endMeetingForAll(this).then(function (end) {
-        _this58.meetingFiniteStateMachine.end();
-        _this58.clearMeetingData();
+        _this46.meetingFiniteStateMachine.end();
+        _this46.clearMeetingData();
         // upload logs on leave irrespective of meeting delete
-        _triggerProxy.default.trigger(_this58, {
+        _triggerProxy.default.trigger(_this46, {
           file: 'meeting/index',
           function: 'endMeetingForAll'
-        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this58);
+        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this46);
         return end;
       }).catch(function (error) {
-        _this58.meetingFiniteStateMachine.fail(error);
+        _this46.meetingFiniteStateMachine.fail(error);
         _loggerProxy.default.logger.error('Meeting:index#endMeetingForAll --> Failed to end meeting ', error);
         // upload logs on leave irrespective of meeting delete
-        _triggerProxy.default.trigger(_this58, {
+        _triggerProxy.default.trigger(_this46, {
           file: 'meeting/index',
           function: 'endMeetingForAll'
-        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this58);
+        }, _constants.EVENTS.REQUEST_UPLOAD_LOGS, _this46);
         _metrics.default.sendBehavioralMetric(_constants2.default.MEETING_END_ALL_FAILURE, {
-          correlation_id: _this58.correlationId,
-          locus_id: _this58.locusUrl.split('/').pop(),
+          correlation_id: _this46.correlationId,
+          locus_id: _this46.locusUrl.split('/').pop(),
           reason: error.message,
           stack: error.stack,
           code: error.code
@@ -6951,11 +6069,11 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "checkMediaConnection",
     value: function checkMediaConnection() {
-      var _this$mediaProperties9;
-      if ((_this$mediaProperties9 = this.mediaProperties) !== null && _this$mediaProperties9 !== void 0 && _this$mediaProperties9.webrtcMediaConnection) {
+      var _this$mediaProperties5;
+      if ((_this$mediaProperties5 = this.mediaProperties) !== null && _this$mediaProperties5 !== void 0 && _this$mediaProperties5.webrtcMediaConnection) {
         return;
       }
-      throw new Error('Webrtc media connection is missing, call addMedia() first');
+      throw new _webexErrors.NoMediaEstablishedYetError();
     }
 
     /**
@@ -6967,43 +6085,171 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "enableMusicMode",
     value: function () {
-      var _enableMusicMode = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(shouldEnableMusicMode) {
-        return _regenerator.default.wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _enableMusicMode = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(shouldEnableMusicMode) {
+        return _regenerator.default.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               this.checkMediaConnection();
               if (this.isMultistream) {
-                _context12.next = 3;
+                _context17.next = 3;
                 break;
               }
               throw new Error('enableMusicMode() only supported with multistream');
             case 3:
               if (!shouldEnableMusicMode) {
-                _context12.next = 8;
+                _context17.next = 8;
                 break;
               }
-              _context12.next = 6;
+              _context17.next = 6;
               return this.mediaProperties.webrtcMediaConnection.setCodecParameters(_internalMediaCore.MediaType.AudioMain, {
                 maxaveragebitrate: '64000',
                 maxplaybackrate: '48000'
               });
             case 6:
-              _context12.next = 10;
+              _context17.next = 10;
               break;
             case 8:
-              _context12.next = 10;
+              _context17.next = 10;
               return this.mediaProperties.webrtcMediaConnection.deleteCodecParameters(_internalMediaCore.MediaType.AudioMain, ['maxaveragebitrate', 'maxplaybackrate']);
             case 10:
             case "end":
-              return _context12.stop();
+              return _context17.stop();
           }
-        }, _callee12, this);
+        }, _callee17, this);
       }));
-      function enableMusicMode(_x7) {
+      function enableMusicMode(_x13) {
         return _enableMusicMode.apply(this, arguments);
       }
       return enableMusicMode;
     }()
+    /** Updates the tracks being sent on the transcoded media connection
+     *
+     * @returns {Promise<void>}
+     */
+  }, {
+    key: "updateTranscodedMediaConnection",
+    value: function updateTranscodedMediaConnection() {
+      var _this$mediaProperties6,
+        _this$mediaProperties7,
+        _this$mediaProperties8,
+        _this47 = this;
+      var LOG_HEADER = 'Meeting:index#updateTranscodedMediaConnection -->';
+      _loggerProxy.default.logger.info("".concat(LOG_HEADER, " starting"));
+      if (!this.canUpdateMedia()) {
+        return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION, {});
+      }
+      return this.mediaProperties.webrtcMediaConnection.update({
+        localTracks: {
+          audio: ((_this$mediaProperties6 = this.mediaProperties.audioTrack) === null || _this$mediaProperties6 === void 0 ? void 0 : _this$mediaProperties6.underlyingTrack) || null,
+          video: ((_this$mediaProperties7 = this.mediaProperties.videoTrack) === null || _this$mediaProperties7 === void 0 ? void 0 : _this$mediaProperties7.underlyingTrack) || null,
+          screenShareVideo: ((_this$mediaProperties8 = this.mediaProperties.shareTrack) === null || _this$mediaProperties8 === void 0 ? void 0 : _this$mediaProperties8.underlyingTrack) || null
+        },
+        direction: {
+          audio: _media.default.getDirection(true, this.mediaProperties.mediaDirection.receiveAudio, this.mediaProperties.mediaDirection.sendAudio),
+          video: _media.default.getDirection(true, this.mediaProperties.mediaDirection.receiveVideo, this.mediaProperties.mediaDirection.sendVideo),
+          screenShareVideo: _media.default.getDirection(false, this.mediaProperties.mediaDirection.receiveShare, this.mediaProperties.mediaDirection.sendShare)
+        },
+        remoteQualityLevel: this.mediaProperties.remoteQualityLevel
+      }).then(function () {
+        _loggerProxy.default.logger.info("".concat(LOG_HEADER, " done"));
+      }).catch(function (error) {
+        _loggerProxy.default.logger.error("".concat(LOG_HEADER, " Error: "), error);
+        _metrics.default.sendBehavioralMetric(_constants2.default.UPDATE_MEDIA_FAILURE, {
+          correlation_id: _this47.correlationId,
+          locus_id: _this47.locusUrl.split('/').pop(),
+          reason: error.message,
+          stack: error.stack
+        });
+        throw error;
+      });
+    }
+
+    /**
+     * Publishes a track.
+     *
+     * @param {LocalTrack} track to publish
+     * @returns {Promise}
+     */
+  }, {
+    key: "publishTrack",
+    value: function () {
+      var _publishTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee18(track) {
+        return _regenerator.default.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              if (track) {
+                _context18.next = 2;
+                break;
+              }
+              return _context18.abrupt("return");
+            case 2:
+              if (!this.mediaProperties.webrtcMediaConnection) {
+                _context18.next = 9;
+                break;
+              }
+              if (!this.isMultistream) {
+                _context18.next = 8;
+                break;
+              }
+              _context18.next = 6;
+              return this.mediaProperties.webrtcMediaConnection.publishTrack(track);
+            case 6:
+              _context18.next = 9;
+              break;
+            case 8:
+              track.setPublished(true); // for multistream, this call is done by WCME
+            case 9:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee18, this);
+      }));
+      function publishTrack(_x14) {
+        return _publishTrack.apply(this, arguments);
+      }
+      return publishTrack;
+    }()
+    /**
+     * Un-publishes a track.
+     *
+     * @param {LocalTrack} track to unpublish
+     * @returns {Promise}
+     */
+  }, {
+    key: "unpublishTrack",
+    value: function () {
+      var _unpublishTrack = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee19(track) {
+        return _regenerator.default.wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
+            case 0:
+              if (track) {
+                _context19.next = 2;
+                break;
+              }
+              return _context19.abrupt("return");
+            case 2:
+              if (!(this.isMultistream && this.mediaProperties.webrtcMediaConnection)) {
+                _context19.next = 7;
+                break;
+              }
+              _context19.next = 5;
+              return this.mediaProperties.webrtcMediaConnection.unpublishTrack(track);
+            case 5:
+              _context19.next = 8;
+              break;
+            case 7:
+              track.setPublished(false); // for multistream, this call is done by WCME
+            case 8:
+            case "end":
+              return _context19.stop();
+          }
+        }, _callee19, this);
+      }));
+      function unpublishTrack(_x15) {
+        return _unpublishTrack.apply(this, arguments);
+      }
+      return unpublishTrack;
+    }()
     /**
      * Publishes specified local tracks in the meeting
      *
@@ -7013,84 +6259,85 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "publishTracks",
     value: function () {
-      var _publishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(tracks) {
-        var _tracks$screenShare;
-        var _tracks$screenShare2, oldTrack, localDisplayTrack, _oldTrack, localTrack, _oldTrack2, _localTrack;
-        return _regenerator.default.wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _publishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21(tracks) {
+        var _tracks$screenShare,
+          _tracks$screenShare2,
+          _tracks$screenShare3,
+          _this48 = this;
+        var floorRequestNeeded, _tracks$screenShare4;
+        return _regenerator.default.wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               this.checkMediaConnection();
-              if (this.isMultistream) {
-                _context13.next = 3;
+              this.annotationInfo = tracks.annotationInfo;
+              if (!(!tracks.microphone && !tracks.camera && !((_tracks$screenShare = tracks.screenShare) !== null && _tracks$screenShare !== void 0 && _tracks$screenShare.audio) && !((_tracks$screenShare2 = tracks.screenShare) !== null && _tracks$screenShare2 !== void 0 && _tracks$screenShare2.video))) {
+                _context21.next = 4;
                 break;
               }
-              throw new Error('publishTracks() only supported with multistream');
-            case 3:
-              this.annotationInfo = tracks.annotationInfo;
-              if (!((_tracks$screenShare = tracks.screenShare) !== null && _tracks$screenShare !== void 0 && _tracks$screenShare.video)) {
-                _context13.next = 15;
+              return _context21.abrupt("return");
+            case 4:
+              floorRequestNeeded = false;
+              if (!((_tracks$screenShare3 = tracks.screenShare) !== null && _tracks$screenShare3 !== void 0 && _tracks$screenShare3.video)) {
+                _context21.next = 9;
                 break;
               }
-              oldTrack = this.mediaProperties.shareTrack;
-              localDisplayTrack = (_tracks$screenShare2 = tracks.screenShare) === null || _tracks$screenShare2 === void 0 ? void 0 : _tracks$screenShare2.video;
-              oldTrack === null || oldTrack === void 0 ? void 0 : oldTrack.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
-
-              // we are starting a screen share
-              this.mediaProperties.setLocalShareTrack(localDisplayTrack);
-              localDisplayTrack.on(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
-              _context13.next = 12;
-              return this.requestScreenShareFloor();
-            case 12:
-              this.mediaProperties.mediaDirection.sendShare = true;
-              _context13.next = 15;
-              return this.mediaProperties.webrtcMediaConnection.publishTrack(this.mediaProperties.shareTrack);
-            case 15:
+              _context21.next = 8;
+              return this.setLocalShareTrack((_tracks$screenShare4 = tracks.screenShare) === null || _tracks$screenShare4 === void 0 ? void 0 : _tracks$screenShare4.video);
+            case 8:
+              floorRequestNeeded = true;
+            case 9:
               if (!tracks.microphone) {
-                _context13.next = 25;
+                _context21.next = 12;
                 break;
               }
-              _oldTrack = this.mediaProperties.audioTrack;
-              localTrack = tracks.microphone;
-              _oldTrack === null || _oldTrack === void 0 ? void 0 : _oldTrack.off(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
-              this.mediaProperties.setLocalAudioTrack(localTrack);
-              this.mediaProperties.mediaDirection.sendAudio = true;
-
-              // audio mute state could be undefined if you have not sent audio before
-              if (!this.audio) {
-                this.audio = (0, _muteState.createMuteState)(_constants.AUDIO, this, this.mediaProperties.mediaDirection, false);
-              } else {
-                this.audio.handleLocalTrackChange(this);
-              }
-              localTrack.on(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
-              _context13.next = 25;
-              return this.mediaProperties.webrtcMediaConnection.publishTrack(this.mediaProperties.audioTrack);
-            case 25:
+              _context21.next = 12;
+              return this.setLocalAudioTrack(tracks.microphone);
+            case 12:
               if (!tracks.camera) {
-                _context13.next = 35;
+                _context21.next = 15;
                 break;
               }
-              _oldTrack2 = this.mediaProperties.videoTrack;
-              _localTrack = tracks.camera;
-              _oldTrack2 === null || _oldTrack2 === void 0 ? void 0 : _oldTrack2.off(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
-              this.mediaProperties.setLocalVideoTrack(_localTrack);
-              this.mediaProperties.mediaDirection.sendVideo = true;
-
-              // video state could be undefined if you have not sent video before
-              if (!this.video) {
-                this.video = (0, _muteState.createMuteState)(_constants.VIDEO, this, this.mediaProperties.mediaDirection, false);
-              } else {
-                this.video.handleLocalTrackChange(this);
+              _context21.next = 15;
+              return this.setLocalVideoTrack(tracks.camera);
+            case 15:
+              if (this.isMultistream) {
+                _context21.next = 18;
+                break;
+              }
+              _context21.next = 18;
+              return this.updateTranscodedMediaConnection();
+            case 18:
+              if (!floorRequestNeeded) {
+                _context21.next = 21;
+                break;
               }
-              _localTrack.on(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
-              _context13.next = 35;
-              return this.mediaProperties.webrtcMediaConnection.publishTrack(this.mediaProperties.videoTrack);
-            case 35:
+              _context21.next = 21;
+              return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
+                lambda: function () {
+                  var _lambda2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee20() {
+                    return _regenerator.default.wrap(function _callee20$(_context20) {
+                      while (1) switch (_context20.prev = _context20.next) {
+                        case 0:
+                          return _context20.abrupt("return", _this48.requestScreenShareFloor());
+                        case 1:
+                        case "end":
+                          return _context20.stop();
+                      }
+                    }, _callee20);
+                  }));
+                  function lambda() {
+                    return _lambda2.apply(this, arguments);
+                  }
+                  return lambda;
+                }()
+              });
+            case 21:
             case "end":
-              return _context13.stop();
+              return _context21.stop();
           }
-        }, _callee13, this);
+        }, _callee21, this);
       }));
-      function publishTracks(_x8) {
+      function publishTracks(_x16) {
         return _publishTracks.apply(this, arguments);
       }
       return publishTracks;
@@ -7104,19 +6351,13 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
   }, {
     key: "unpublishTracks",
     value: function () {
-      var _unpublishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(tracks) {
-        var unpublishPromises, _iterator, _step, track;
-        return _regenerator.default.wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _unpublishTracks = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22(tracks) {
+        var promises, _iterator, _step, track;
+        return _regenerator.default.wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               this.checkMediaConnection();
-              if (this.isMultistream) {
-                _context14.next = 3;
-                break;
-              }
-              throw new Error('unpublishTracks() is only supported with multistream');
-            case 3:
-              unpublishPromises = [];
+              promises = [];
               _iterator = _createForOfIteratorHelper(tracks.filter(function (t) {
                 return !!t;
               }));
@@ -7124,23 +6365,18 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
                 for (_iterator.s(); !(_step = _iterator.n()).done;) {
                   track = _step.value;
                   if (track === this.mediaProperties.shareTrack) {
-                    this.mediaProperties.setLocalShareTrack(null);
-                    track.off(_mediaHelpers.LocalTrackEvents.Ended, this.handleShareTrackEnded);
-                    this.releaseScreenShareFloor(); // we ignore the returned promise here on purpose
-                    this.mediaProperties.mediaDirection.sendShare = false;
-                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(track));
+                    try {
+                      this.releaseScreenShareFloor(); // we ignore the returned promise here on purpose
+                    } catch (e) {
+                      // nothing to do here, error is logged already inside releaseScreenShareFloor()
+                    }
+                    promises.push(this.setLocalShareTrack(undefined));
                   }
                   if (track === this.mediaProperties.audioTrack) {
-                    this.mediaProperties.setLocalAudioTrack(null);
-                    this.mediaProperties.mediaDirection.sendAudio = false;
-                    track.off(_mediaHelpers.LocalTrackEvents.Muted, this.localAudioTrackMuteStateHandler);
-                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(track));
+                    promises.push(this.setLocalAudioTrack(undefined));
                   }
                   if (track === this.mediaProperties.videoTrack) {
-                    this.mediaProperties.setLocalVideoTrack(null);
-                    this.mediaProperties.mediaDirection.sendVideo = false;
-                    track.off(_mediaHelpers.LocalTrackEvents.Muted, this.localVideoTrackMuteStateHandler);
-                    unpublishPromises.push(this.mediaProperties.webrtcMediaConnection.unpublishTrack(track));
+                    promises.push(this.setLocalVideoTrack(undefined));
                   }
                 }
               } catch (err) {
@@ -7148,15 +6384,18 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
               } finally {
                 _iterator.f();
               }
-              _context14.next = 8;
-              return _promise.default.all(unpublishPromises);
-            case 8:
+              if (!this.isMultistream) {
+                promises.push(this.updateTranscodedMediaConnection());
+              }
+              _context22.next = 7;
+              return _promise.default.all(promises);
+            case 7:
             case "end":
-              return _context14.stop();
+              return _context22.stop();
           }
-        }, _callee14, this);
+        }, _callee22, this);
       }));
-      function unpublishTracks(_x9) {
+      function unpublishTracks(_x17) {
         return _unpublishTracks.apply(this, arguments);
       }
       return unpublishTracks;