Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev