Merge "Fixing callback delivery for ContactSaveService"