Merge "Abort connecting to native daemon during shutdown"