Merge "Fix deadlock on destroy of CommandFactoryProvider."