Merge pull request #5749 from matrix-org/t3chguy/spaces4.6

Properly gate SpaceRoomView behind labs

src/components/structures/RoomView.tsx

@@ -1911,7 +1911,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             );
         }
 
-        if (this.state.room?.isSpaceRoom()) {
+        if (SettingsStore.getValue("feature_spaces") && this.state.room?.isSpaceRoom()) {
             return <SpaceRoomView
                 space={this.state.room}
                 justCreatedOpts={this.props.justCreatedOpts}