Merge "Pass augmented client state to the event history." into rvc-dev