Merge "Increase TEST_LINGER_DELAY_MS"