Merge "Toast Fixes" into ub-contactsdialer-h-dev am: e02d574e9d
am: 6a3de2d7fc

Change-Id: Iade4fd68c20f4eab6e53959cd6d55381252bc020