MPDroid: Fix some misplaced listener cleanups.
Temporary