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 1015412 - [FMRadio] Implement new startup loading events
Bug 1023908 - [Contacts] Disable interminent integration test
Merge pull request #20234 from crdlc/bug-1022390

Bug 1022390 - [Vertical] Cancel download of apps
[B2G][Lockscreen] Long pressing power button on lockscreen does not bring up reboot menu
Merge pull request #20368 from arcturus/bug-1023908

Bug 1023908 - [Contacts] Disable interminent integration test r=rik
Bug 1023878 - make sure we stop if the make targets fail.
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.
Bug 1020605 - (gaia-grid) Append all children to shadow root by removing <content> selector tag.
Bug 1020342 - Update marionette client in gaiatest to 0.7.9
Bug 1021512 - Send a touchcancel to the active app when the system starts swallowing touch events.
Bug 1023288 - NFC configuration is not working correctly in variant.json file.
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
Bug 1022941 - [email] On language change, cached timestamps do not change to new language
Merge pull request #20372 from 6a68/revert-bug-1004251

Revert "Bug 1004251 - Add resend verification email to firefox accounts....
Bug 1004251 - (resubmitted) Add resend verification email to firefox accounts. r=ferjm,arthurcc
Merge pull request #20359 from EverythingMe/1023312-floor-dimension

Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]