Merge "Send transaction callbacks earlier" into rvc-dev