See the commit descriptions.
Fixes Don't show the room timeline when an invitation... (#950 - closed).
