- Adding temp common class on mobile.
- Some cleanup on MListenerService