Bug 1031430 - (2.0-visual-refresh)[Notifications and Alarms] - Add New Signature Firefox OS tone
Bug 1030550 - Turn off bfcache by adding unload event listener. r=rik
Bug 1039239 - Better NFC handover error handling - v2.0
Merge pull request #21905 from elefant/bug/1030550-dup-system-message-v2.0

Bug 1030550 - Turn off bfcache by adding unload event listener. r=rik
Merge pull request #22028 from tauzen/Bug_1039239_2.0_with_test

Bug 1039239 - Better NFC handover error handling - v2.0
Merge pull request #21512 from anefzaoui/bug-876825

Bug 876825 - Mixed LTR & RTL content support in text input fields and textarea
Conflicts:
	apps/homescreen/elements/search_page.html
	apps/system/index.html
Merge pull request #22006 from weigao123/bug1039957-master

Bug 1039957 - [master] Make only check box hide when FDN enabled. r=Arthur.
Merge pull request #21789 from RudyLu/keyboard/Bug1036075_2

Bug 1036075 - [L10n] Keyboard goes CAPS LOCK after typing 100 characters and selecting a suggestion.
r=djf
Merge pull request #21560 from jimporter/ringtones-new-default-2.0

Bug 1031430 - (2.0-visual-refresh)[Notifications and Alarms] - Add New S...
Merge pull request #21824 from mcjimenez/bug1039222

Bug 1039222 - [SingleVariant] Removed maximum MMS size customization (r =jmcanterafonseca)
Merge pull request #21955 from arcturus/bug-1038414

Bug 1038414 - [B2G][Contacts][Camera][273MB Flame] Camera app OOMs when adding picture to contact r=jmcf
Merge pull request #21934 from acperez/bug-1040700

Bug 1040700 - Modify APN for ATT because last update doesn't work as expected. r=jaoo
Merge pull request #21862 from lodr/bug-1039984-smartcollections-and-homescreen

Bug 1039984 - [System] Trying to open a smartcollection after killing th...
Merge pull request #21914 from KevinGrandon/bug_1040686_homescreen_settings

Bug 1040686 - [Homescreen] Remove column settings section
Conflicts:
	apps/settings/elements/homescreen.html
Merge pull request #21957 from khuey/willReadFrequently

Bug 1041112: Add willReadFrequently to grid_icon_renderer to avoid hitti.... r=kgrandon
Merge pull request #22000 from guilherme-pg/bug1041591-can-disable-logout

Bug 1041591 - Don't set 'findmydevice.can-disable' if not registered on ...
Merge pull request #21916 from mikehenrty/bug-1040650-apn-quito

Bug 1040650 - add Quito timezone
Bug 1037880 - FM radio should stop sound in speaker mode when I receive an incoming call
Merge pull request #21877 from etiennesegonzac/bug-1036642

Bug 1036642 - Enable access to the rocketbar while on a call. r=21
(cherry picked from commit 946c019bd52af3de71895e8a7c54c48e58ad6bf1)

Conflicts:
	apps/system/js/home_searchbar.js
	apps/system/test/unit/rocketbar_test.js
Merge pull request #22063 from etiennesegonzac/bug-1036642-2.0-uplift

bug-1036642 uplift to 2.0