[WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable

res/css/views/rooms/_RoomSublist2.scss

@@ -24,6 +24,8 @@ limitations under the License.
     margin-left: 8px;
     width: 100%;
 
+    flex-shrink: 0; // to convince safari's layout engine the flexbox is fine
+
     .mx_RoomSublist2_headerContainer {
         // Create a flexbox to make alignment easy
         display: flex;