Merge "Add sleep in SuspendAllDaemonThreadsForShutdown"