Improve room upgrades

Only filter out replaced rooms if we're joined to the new room. Make sure this is updated in live in the room list

Fixes #607 (closed)