Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev