Conflicts: src/component-index.js src/components/views/rooms/RoomList.js cherry-picking commit ce119a6.
ce119a6