Merge "Fix locking issues in the callback notifier"