Merge "Reduced the retry after disconnect delay"