Merge "Fix endless loop in calling registerCallback/unregisterCallback"