Livestream category improvements (#7115) - w/ commits

- It's a change with lots of refactoring, so keeping the individual commits will be useful for posterity.
- The commits have been squashed to a minimal set.
- Output is identical to the initial merge.