Merge "Definitely abort reconnecting to native daemon during shutdown"