Bug 979086 SMS Gallery Landscape Mode, Dup:Bug960215
Apply this patch: https://github.com/mozilla-b2g/gaia/pull/15512
Bug 987838 - Intermittent failing test: Notification.get(): notifications should persist even after closing app
Bug 987838 - Fix lint errors due to disabling of intermittent test
Merge pull request #17344 from mcav/apop

Bug 983167 - [email/POP3] broken node-crypto.js shim causes auth failure...
Merge pull request #17572 from steveck-chung/bug-986465

Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo. r=borja(cherry picked from commit 0aaacfb35bc914814904a02a49e1abb9a56ac099)
 Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
 disable after switching the keyboard as pinyin.
   - Remove the touchmove event listeners from the touched keys
   when switching layouts.
r=timdream
a=fabrice
Merge pull request #17556 from shamenchens/Bug979086-Gallery-Landscape

Bug 979086 SMS Gallery Landscape Mode
Revert "Revert "Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring." for suspicion of breaking gaia integration tests"

This reverts commit a968d8cd00fa1f370a2ea7e3994b5bb5391affd7.
Bug 974253 - Set preferred network type on startup based on the user preference
Bug 987445 - [B2G][SMS]Delete button behavior intermittently unexpected when no conversations are selected r=arnau

This removes the 'vertical-align: middle' property for icon buttons.
Merge pull request #17678 from crh0716/974253_v2_v1.3

Bug 974253 - Set preferred network type on startup based on the user preference
Merge pull request #17499 from dominickuo/bug-982540

Bug 982540 - [Music] Recover the status to PLAYING after the player is resumed from the mozinterrupend event, r=jimporter
Bug 988148 - Hide the mobile connection state if it is emergency calls only and not primary sim

Conflicts:
	apps/system/js/lockscreen_connection_info_manager.js
Bug 988621 - Add checks on IccHelper.iccInfo
Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
(cherry picked from commit 32078fe945de8001765526fa7e8e1283d3c09669)

Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
	apps/communications/contacts/test/unit/mock_navigation.js
Revert "Merge pull request #17499 from dominickuo/bug-982540"

This reverts commit 85c0ce7239d544add7be2d6053ed78e2b4a3dccf.
Merge pull request #17722 from julienw/987445-v1.3-remove-vertical-align-middle-for-icon-buttons

Bug 987445 - [B2G][SMS]Delete button behavior intermittently unexpected ...
Bug 982540 - [Music] Recover the status to PLAYING after the player is resumed from the mozinterrupend event
Merge pull request #17808 from dominickuo/v1.3-bug-982540

Bug 982540 - [Music] Recover the status to PLAYING after the player is resumed from the mozinterrupend event, r=jimporter
Merge pull request #17474 from gitmai/bug-986473-CC-modify-parameters

Bug 986473 -Modify cost control parameters
r=salva