Bug 819467 - [Dialer] Caller's info appears with a black window first, which then replaces with the wallpaper.
Bug 825806 - Make trusted UI work with Cards view, r=ferjm,
    a=blocking-basecamp
Merge pull request #7336 from alivedise/bugzilla/825806/untrusted-trusted-ui

Bug 825806 - Make trusted UI work with Cards view
Merge pull request #7391 from gtorodelvalle/dialer-bug-819467-contact-photo-black-background

Bug 819467 - [Dialer] Caller's info appears with a black window first, which then replaces with the wallpaper
Auto-merge from branch 'master'