Merge up from develop

src/components/structures/ScrollPanel.js

@@ -540,7 +540,6 @@ module.exports = React.createClass({
         // it's not obvious why we have a separate div and ol anyway.
         return (<GeminiScrollbar autoshow={true} ref="geminiPanel"
                 onScroll={this.onScroll} onResize={this.onResize}
-                relayoutOnUpdate={false}
                 className={this.props.className} style={this.props.style}>
                     <div className="mx_RoomView_messageListWrapper">
                         <ol ref="itemlist" className="mx_RoomView_MessageList" aria-live="polite">

src/components/structures/UserSettings.js

@@ -463,7 +463,6 @@ module.exports = React.createClass({
                 <SimpleRoomHeader title="Settings" onCancelClick={ this.props.onClose }/>
 
                 <GeminiScrollbar className="mx_UserSettings_body"
-                                 relayoutOnUpdate={false}
                                  autoshow={true}>
 
                 <h3>Profile</h3>