Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676

 Conflicts:

	src/SlashCommands.tsx

	src/i18n/strings/de_DE.json

src/components/structures/RoomView.js

@@ -1933,6 +1933,7 @@ export default createReactClass({
                     disabled={this.props.disabled}
                     showApps={this.state.showApps}
                     e2eStatus={this.state.e2eStatus}
+                    resizeNotifier={this.props.resizeNotifier}
                     permalinkCreator={this._getPermalinkCreatorForRoom(this.state.room)}
                 />;
         }