2080-fix-muc-roster-drag-and-drop -> upstream