Merge "Fix invocation of notification callback in case the callback is modified"