Merge pull request #23006 from nullaus/v2.0

Merge pull request #22945 from nullaus/bug1053509
Bug 1043662 - [Flame] Missing labels in Firefox Ringtones and Alerts
Merge pull request #22998 from lodr/bug-1043662-missing-labels

Bug 1043662 - [Flame] Missing labels in Firefox Ringtones and Alerts
r=yurenju
Merge pull request #22908 from jrburke/bug1001629-email-notification-close-blank

Bug 1001629: email notification clear triggers failure in startup r=asuth