addressed review comments

modules/devices/mediaDeviceHelper.js

             return availableAudioInputDevices[0].deviceId;
         }
     } else if (selectedAudioInputDevice
-        && selectedAudioInputDeviceId !== localAudio.getDeviceId()) {
+        && selectedAudioInputDeviceId !== localAudioDeviceId) {
 
         if (newLabel) {
             // If a Firefox user with manual permission prompt chose a different
             return availableVideoInputDevices[0].deviceId;
         }
     } else if (selectedVideoInputDevice
-            && selectedVideoInputDeviceId !== localVideo.getDeviceId()) {
+            && selectedVideoInputDeviceId !== localVideoDeviceId) {
 
         if (newLabel) {
             // If a Firefox user with manual permission prompt chose a different