Bug 1029853 - Hide open browser screens when browser invoked via activity. r=daleharvey
Merge pull request #21079 from KevinGrandon/bug_1030215_collection_attributes

Bug 1030215 - [Smart Collections] SC contextual menu is not localized
Merge pull request #21056 from millermedeiros/1030552-month-all-day-l10n

Bug 1030552 - [Calendar] "All day" on month view is not localized for All day events r=gaye
Merge pull request #20639 from yglazko/fmd_settings_url

Bug 992929 - URL in FMD device Settings is Incorrect
Conflicts:
	apps/settings/elements/findmydevice.html