Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev am: 6f42d1bac2
am: 8f1ae6589b

Change-Id: Ic7bae8dc438502d9c1544b3001d31b913cfff967