Merge "Put broadcast timekeeping on its own thread" into sc-dev