Merge timelines for upgraded rooms

[KitsuneRal]

This is a callout from #235 for its last optional item: provide API to the clients to retrieve the merged timeline across room upgrades, optimising away power level event replicas etc. (the optimisation depends on #36 and #276).