Merge "Fix crash when QuickContactActivity opened from dialer" into ub-contactsdialer-h-dev