Bug 1024992 - Change Flame device name from 'msm8610' to 'flame'
Revert "Bug 1019546 - [Visual Refresh][Dialer] Fix dial pad and contacts overlapping when being switched between. r=rik"

This reverts commit dd3b9f32a60746366c8b6b5118fa2a556e5d73a9.
Merge pull request #20397 from jimporter/email-as-user-agent

Bug 880670 - [email/activesync] some ActiveSync implementations blacklis...
Merge pull request #20485 from RudyLu/keyboard/Bug1013739-persistent_alternativeMenu_master

Bug 1013739 - [Dolphin][Flame][FFOS 1.4]Long touch the build-in keyboard
r=timdream
Merge pull request #20370 from acperez/bug-1023288

Bug 1023288 - NFC configuration is not working correctly in variant.json file.
Merge pull request #20317 from etiennesegonzac/bug-1021512-homescreen-utility-tray

Bug 1021512 - Send a touchcancel to the active app when the system starts r=21,kgrandon
Merge pull request #20332 from alivedise/bugzilla/1021270/smart-collection

Bug 1021270 - Focus the top active window while permission dialog hide, r=timdream
Merge pull request #20340 from alivedise/bugzilla/1022022/orientation-unlock-in-rocketbar

Bug 1022022 - Reset orientation when search window closing, r=timdream
Merge pull request #20290 from EverythingMe/1020961-indications

Bug 1020961 - [Collection app] Loading progress indicator and Connectivity message
Merge pull request #20357 from flodolo/bug1018042

Bug 1018042 - [Settings] Pass available size as number to l10n.js
Merge pull request #20393 from TheoChevalier/video-menu-l10n

Bug 1024239 - [video] New menu on video is not localized
Merge pull request #20414 from EverythingMe/1024330-ctx

Bug 1024330 - [Everything.me] Device context for Partners API
Merge pull request #20168 from justindarc/bug1015412

Bug 1015412 - [FMRadio] Implement new startup loading events
Conflicts:
	tests/performance/startup_events_test.js
Merge pull request #20382 from KevinGrandon/bug_1023714_vertical_cancel_localization

Bug 1023714 - [vertical homescreen] Cancel button is not localized after a long press on the homescreen
Merge pull request #20450 from lightsofapollo/1024280

Bug 1024280 - Fix awful error where we dont pass blobs during package app install during pending
Bug 1015094 - [NFC][Contacts] Contact cannot updated via NFC more than twice r=jmcf

Conflicts:
	apps/communications/contacts/test/unit/vcard_parsing_test.js
Merge pull request #20383 from 6a68/resubmit-bug-1004251-fxa-resend-email

Bug 1004251 - (resubmitted) Add resend verification email to firefox acc...
Merge pull request #20267 from pacorampas/delete-button-moved-1020744

Bug 1020744 - [Dialer][Flame] Enter more than 19 digits in dialer, back delete button moved couple pixels to the left
Merge pull request #20456 from KevinGrandon/bug_1023817_vertical_font_sizing

Bug 1023817 - [vertical] Several app names are truncated because of font-size
Merge pull request #20391 from 6a68/bug-1021428-fmd-offline-error

Bug 1021428 - Show error when FMD button is clicked without network connection