Merge "Cleanup threading in StatsCompanionService" into rvc-dev