Can't remove room that's been upgraded from space

### Steps to reproduce

@benparsons reports that he added a room to a space before upgrading the room. Because he happens to be in the old version of the room as well as the new one, Element shows the new room as being in the space as well. But when he tries to remove the room from the space, Element uses the new room ID instead of the new one, and therefore doesn't remove it from the space at all.

### Outcome

#### What did you expect?

Old room is removed from space.

#### What happened instead?

Old room is still in space.

### Operating system

Mac

### Browser information

Chrome

### URL for webapp

develop.element.io

### Application version

762fc53c6150-react-254dbeeccb26-js-41bf8c2d5f4a

### Homeserver

element.io

### Will you send logs?

No