Merge "Fix crash when QuickContactActivity opened from dialer" into ub-contactsdialer-h-dev am: 2a2cc48c03
am: b426fd0773

Change-Id: I11a0d916261d1b05da70ef25aec6c574d58b6fb8