Deal with apps on local call vs dialled calls
Dial merging was moved into Adhearsion core
Merge dials the correct way around and ensure correct hangup cascade