Merge "MessageQueue: explicitly remove FD event listeners."