Bug 1031430 - (2.0-visual-refresh)[Notifications and Alarms] - Add New Signature Firefox OS tone
Bug 1035480 - Add new locales to Gaia and get the same list on 2.0
Bug 1028253 - Camera App memory regression in FxOS
Bug 1033207 - Do not overwrite the custom apn settings
Bug 1024440 - Handle hidpi video files when zipping app. r=yurenju
Merge pull request #21844 from crh0716/1033207_v2.0

Bug 1033207 - Do not overwrite the custom apn settings r=jaoo
Merge pull request #21757 from KevinGrandon/bug_1038576_rocketbar_focus

Bug 1038576 - [Rocketbar] Swiping starting from Rocketbar should not invoke Rocketbar
Merge pull request #21800 from KevinGrandon/bug_1039180_statusbar_icon_fix

Bug 1039180 - [System] Fix statubar upper positioning
Merge pull request #21778 from DouglasSherk/1035183-dialer-matched-numbers

Bug 1035183 - [Dialer] Make matched suggestions not appear when there are more than 50, remove + indicator. r=Rik
Conflicts:
	apps/communications/dialer/js/suggestion_bar.js
Bug 1037556 - [B2G][OTA] Smart collections are not displayed after OTA 1.3 to 2.0
Merge pull request #21580 from punamdahiya/Bug1028359

Bug1028359-[Gallery]-Fix of flickering edit effects image buttons for high resolution images r=djf
Merge pull request #21830 from Rik/facebook-callscreen-1032725

Bug 1032725 - Facebook contact infos are not reflected in call screen
Merge pull request #21842 from dmarcos/bug1037638

Bug 1037638 - Restrict to 3MP images (CONFIG_MAX_IMAGE_PIXEL_SIZE) only ...
Merge pull request #21790 from timdream/input-mgmt-inproc-certified-app

Bug 1036577 - Never kill certified keyboard apps, r=rudyl
Merge pull request #21817 from rnowm/1036147

Bug 1036147 - [B2G][Gaia] Lengthy button text does not wrap to second line in 2.0 causing truncation in multiple locations for multiple languages r=pivanov
Conflicts:
	shared/style/buttons.css
Merge pull request #21129 from guilherme-pg/bug1000323-force-reauth-when-disabling

Bug 1000323 - Reauthenticate the user when disabling Find My Device. r=gerard-majax
Merge pull request #21589 from azasypkin/bug-1034600-suggestions

Bug 1034600 - [Messages] Suggestions list is badly located. r=julien
Conflicts:
	apps/sms/test/unit/thread_ui_test.js
Merge pull request #21858 from KevinGrandon/bug_1037256_icon_installation_location_2

Bug 1037256 - [Vertical Homescreen] Newly installed apps are placed into a new group if homescreen has been killed
Revert "Merge pull request #21778 from DouglasSherk/1035183-dialer-matched-numbers"

This reverts commit c30159ff811d153373a783459fefb4efcb8a80c5.
Merge pull request #21774 from justindarc/bug1028253-v2.0

Bug 1028253 - Camera App memory regression in FxOS