Merge "Toast fixes for deletion and save" into ub-contactsdialer-h-dev