Merge "Skip unnecessary sleep during shutdown"