Merge "Prevent LocalSocket from creating an fd if fd is already there"