Merge pull request #17172 from jrburke/bug966147-email-notification-click-close

Bug 966147 - Email Notification doesnt go away when I click on it r=asuth
Merge pull request #16994 from mikehenrty/bug-979624-connecting

Bug 979624 - [B2G][Dialer][All languages] Performing a call while in a c..., r=etienne