Bug 1031430 - (2.0-visual-refresh)[Notifications and Alarms] - Add New Signature Firefox OS tone
Revert "Merge pull request #21567 from cctuan/1035453"

This reverts commit c07e2d88ec49691f92c3ad552f1c2b3a6098c76e.
Revert "Merge pull request #21773 from lissyx/bug1030063_2.0"

This reverts commit 72fef00c8c7bc96927f70fbff2c955be7410aacf, reversing
changes made to f72b8071f3784998135d4afd94a3de1b2184910b.
Bug 1035480 - Add new locales to Gaia and get the same list on 2.0
Bug 1028253 - Camera App memory regression in FxOS
Bug 1030094 - Block simlock UI and FXA UI on l10n being ready. r=iliu
Merge pull request #21673 from ian-liu/system/v20/bug1030094_Skip_and_Done_buttons_not_translated_in_the_Enter_PIN_screen

Bug 1030094 - Block simlock UI and FXA UI on l10n being ready. r=iliu
Bug 1023500 - [VsD Refresh] Lockscreen Visual Refresh > Notifications not to spec
Bug 1038722 - Fix notification integration tests
Merge pull request #21796 from snowmantw/issue1023500-v2.0

Bug 1023500 - [VsD Refresh] Lockscreen Visual Refresh > Notifications no...
Bug 1020166 - Update IMEI tests to handle 1 and 2 IMEIs
Merge pull request #21799 from gmarty/Bug-1038722-v2.0

Bug 1038722 - Fix notification integration tests, a=test only
Merge pull request #21803 from AndreiH/test_mmi_v2.0

Bug 1020166 - Update IMEI tests to handle 1 and 2 IMEIs
Bug 1030063 - Use Notification API for CaptivePortal
Merge pull request #21815 from lissyx/bug1030063_2.0

Bug 1030063 - Use Notification API for CaptivePortal
Merge pull request #21636 from DouglasSherk/1030912-dialer-bluetooth-icon2

Bug 1030912 - Make BluetoothHelper listen for mozBluetooth events. r=ianliu
Merge pull request #21523 from acperez/bug-965826

Bug 965826 - Add mvno_match_data and mvno_type APN properties to the APNs from new market. r=jaoo
Merge pull request #21740 from cctuan/1037041

Bug 1037041 - [B2G][Flame][Music] Music app will not close after attempting to share through email in low memory environments
Merge pull request #21508 from millermedeiros/1002904-shared-icon-font

Bug 1002904 - calendar cold launch regression 100ms hamachi Apr23-Apr25 r=gaye
Merge pull request #21557 from qdot/1031369-tutorial-sim-pin-upgrade

Bug 1031369 - Show System SIM PIN dialog on upgrade after tutorial
Conflicts:
	apps/system/test/unit/sim_lock_test.js