Merge "Increase linger delay and test callback timeout"