Merge "Registering DeviceCallback too much" into rvc-dev