Merge "Toast Fixes" into ub-contactsdialer-h-dev