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

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

@@ -76,6 +76,10 @@ limitations under the License.
     flex: 0 0 auto;
 }
 
+.mx_RoomView_auxPanel_apps {
+    max-width: 1920px ! important;
+}
+
 .mx_RoomView_topUnreadMessagesBar {
     order: 3;
 }

src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss

@@ -43,6 +43,7 @@ limitations under the License.
 }
 
 .mx_AppTile {
+    max-width: 960px;
     width: 50%;
     margin: 0 5px 2px 0;
     border: 1px solid $primary-hairline-color;
@@ -52,6 +53,7 @@ limitations under the License.
 }
 
 .mx_AppTileFullWidth {
+    max-width: 960px;
     width: 100%;
     margin: 0;
     padding: 0;