Merge "Wait for callbacks before exiting test" into rvc-dev