Merge "Avoid reentrant callback when setting up listeners" into rvc-dev