Merge "Fix receive timeout on LocalSocket"