Merge "Track sent conversations better" into rvc-dev