Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev