Merge remote-tracking branch 'origin/develop' into develop

src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss

@@ -135,6 +135,10 @@ limitations under the License.
     width: 200px;
 }
 
+.mx_UserSettings_webRtcDevices_dropdown{
+    width: 200px;
+}
+
 .mx_UserSettings_profileTable
 {
     display: table;