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

Change-Id: I419344f9af3f1fd8e2c593bccf1b86ba7f97037d