Conflicts: src/components/structures/RoomSubList.js src/components/structures/RoomSubListHeader.js cherry-picking commit 095da68.
095da68