Merge "Consume events in dispatcher tests" into rvc-dev