Merge "Kill non namespaced ScopedCallback"