Merge "Add the missing unregisterCallback call" into rvc-dev