Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev