Merge "Add the missing unregisterCallback call"