Merge branches 'develop' and 't3chguy/hide_msg_action_buttons_on_perms' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_msg_action_buttons_on_perms

test/matrix-to-test.js

@@ -57,6 +57,8 @@ function mockRoom(roomId, members, serverACL) {
                 }
             },
         },
+        on: () => undefined,
+        removeListener: () => undefined,
     };
 }