Merge "Fix interaction tracking logic" into rvc-dev