Making call/sms interaction preserve dialog state

And also cleaning up the implementation

Change-Id: I6d9ca845477282d4ef9db7417e99cffc9e608c86
7 files changed