Bug 1017918 - Add mai (Maithili) to Gaia languages
Bug 1022939 - Add ARIA markup for gaia-radio and give example for radio menu items.
Bug 1008987 - [Contacts][Merger] Thumbnail on contacts list disappear when importing same vCard/.vcf file several times
Bug 1021284 - [camera] [flame] spinner appears after every photo capture
Bug 1023208 - [v2.0][v2.1] Fix test_marketplace_launch failure
Merge pull request #20294 from chirarobert/tap_mp_icon

Bug 1023208 - [v2.0][v2.1] Fix test_marketplace_launch failure
Merge pull request #20139 from wilsonpage/1021284

Bug 1021284 - [camera] [flame] spinner appears after every photo capture
Bug 1022390 - [Vertical] Cancel download of apps
Bug 1005823 - [Dialer] Fix emergency calls with no SIM card. r=rik
Merge pull request #19727 from DouglasSherk/1005823-emergency-call

Bug 1005823 - [Dialer] Fix emergency calls with no SIM card. r=rik
Merge pull request #20249 from TheoChevalier/patch-3

Bug 1017918 - Add mai (Maithili) to Gaia languages
Merge pull request #20298 from gitmai/bug-1008987-import-vcard

Bug 1008987 - [Contacts][Merger] Thumbnail on contacts list disappear wh...
r=jmcf
Bug 1022474 - Cannot add an e.me app to the homescreen via wrapper
Bug 1023908 - [Contacts] Disable interminent integration test
Merge pull request #20234 from crdlc/bug-1022390

Bug 1022390 - [Vertical] Cancel download of apps
Merge pull request #20368 from arcturus/bug-1023908

Bug 1023908 - [Contacts] Disable interminent integration test r=rik
Merge pull request #20220 from crdlc/bug-1022474

Bug 1022474 - Cannot add an e.me app to the homescreen via wrapper
Merge pull request #20255 from eeejay/bug-1022939

Bug 1022939 - Add ARIA markup for gaia-radio and give example for radio menu items.
Revert "Bug 1020685: Close only over the URL string that we need. r=bfrancis"

This reverts commit dfa599e45b6da54439374d1983fc10d21d9ebf54.
Revert "Bug 1004251 - Add resend verification email to firefox accounts. r=ferjm,arthurcc"

This reverts commit f8f70f699d50d3669b507c1bad245b1709c95a50.

Conflicts:
	apps/settings/js/firefox_accounts/panel.js