fix(audio-only): combine video status labels

Move the HD label into the newly renamed VideoStatusLabel
component. That way it cannot be possible for the audio only
label and the HD label to display simultaneously.

react/features/conference/components/Conference.web.js

@@ -7,9 +7,9 @@ import { connect, disconnect } from '../../base/connection';
 import { DialogContainer } from '../../base/dialog';
 import { Watermarks } from '../../base/react';
 import { OverlayContainer } from '../../overlay';
-import { StatusLabel } from '../../status-label';
 import { Toolbox } from '../../toolbox';
 import { HideNotificationBarStyle } from '../../unsupported-browser';
+import { VideoStatusLabel } from '../../video-status-label';
 
 declare var $: Function;
 declare var APP: Object;
@@ -93,10 +93,7 @@ class Conference extends Component {
                                 muted = 'true' />
                         </div>
                         <span id = 'localConnectionMessage' />
-                        <span
-                            className = 'video-state-indicator moveToCorner'
-                            id = 'videoResolutionLabel'>HD</span>
-                        <StatusLabel />
+                        <VideoStatusLabel />
                         <span
                             className
                                 = 'video-state-indicator centeredVideoLabel'