Merge "Fix iterator in ServiceManager::removeCallback"