Bug 1028253 - Camera App memory regression in FxOS
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
Bug 1033487 - Wait for homeIcons init before unpinning. r=kgrandon
Merge pull request #21689 from lissyx/bug1031164

Bug 1031164 - Queueing of open-app events on startup r=alive
Conflicts:
	apps/system/js/bootstrap.js
Merge pull request #21739 from crh0716/1036731

Bug 1036731 - Re-activate the link if the url is available r=eragonj
Merge pull request #21785 from gasolin/issue-1033921

Bug 1033921 - [NFC] Shrinking UI incorrectly when using swipe gesture to..., r=alive
Merge pull request #21758 from weigao123/bug1034455-master

Bug 1034455 - [master] radio event will be dispatched untill radio is turned on or off thoroughly. r=EJ
Merge pull request #21684 from mozmark/bug1037171-modified

bug1037171 Ensure find my device cancellation (or error) does not result...
Conflicts:
	apps/settings/test/unit/findmydevice_panel_test.js
Revert "Merge pull request #21508 from millermedeiros/1002904-shared-icon-font"

This reverts commit 7bfb8969cc2c8d9dff1426848a499c13ac848cc7.
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