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