Merge "Revert "Move IMS to a listener type model instead of a poll model""