fix conflicts after rebase

css/_videolayout_default.scss

     font-size: 8pt;
     text-align: center;
     line-height: $thumbnailToolbarHeight;
+    display: none;
     padding: 0;
     margin-right: 5px;
     float: left;

modules/UI/util/UIUtil.js

     getVideoThumbnailIndicatorSpan(opts = {}) {
         let indicatorId = opts.indicatorId;
         let videoSpanId = opts.videoSpanId;
-        let indicators = $(`#${videoSpanId} #${indicatorId}]`);
+        let indicators = $(`#${videoSpanId} [id="${indicatorId}"]`);
         let indicatorSpan;
 
         if (indicators.length <= 0) {

modules/UI/videolayout/ConnectionIndicator.js

         videoSpanId: this.videoContainer.videoSpanId,
         indicatorId
     });
-    element.classList.add('hide');
     this.connectionIndicatorContainer = element;
 
     let popoverContent = (
         `<div class="connection-info" data-i18n="${indicatorId}.na"></div>`
     );
-    this.popover = new JitsiPopover(element, {
+    this.popover = new JitsiPopover($(element), {
         content: popoverContent,
         skin: "black",
         onBeforePosition: el => APP.translation.translateElement(el)

modules/UI/videolayout/SmallVideo.js

-/* global $, APP, JitsiMeetJS, interfaceConfig */
+/* global $, JitsiMeetJS, interfaceConfig */
 import Avatar from "../avatar/Avatar";
 import UIUtil from "../util/UIUtil";
 import UIEvents from "../../../service/UI/UIEvents";
     });
 
     if (show) {
-        indicatorSpan.classList.add('hide');
+        indicatorSpan.classList.add('show');
     } else {
-        indicatorSpan.classList.remove('hide')
+        indicatorSpan.classList.remove('show');
     }
 };
 
     });
 
     if (show) {
-        indicatorSpan.classList.add('hide');
+        indicatorSpan.classList.add('show');
     } else {
-        indicatorSpan.classList.remove('hide')
+        indicatorSpan.classList.remove('show');
     }
 };