Merge "Fix exception of unregisterCallback when callback is not registered"