Bug 1069997 - Implement the progress to spec for the updates notifications and prevent a constant restyle.
Bug 1070495 - [ringtones] unit test refactoring for new version chai.assert api
Bug 1066015 - [Camera] black screen when press power key as soon as you open a camera app
Bug 1070918 - [Dialer] Intermittent failure with newer mocha r=rik
Bug 1070914 - [Contacts] [Settings] SIM Import label has disappeared
Bug 1062806 - Use the new shared helper for loading JSON files in the cost control app
Bug 971486 - [System2] Instantiable EdgeSwipeDetector r=alive
Bug 1011669 - [B2G][Browser]Double-tapping on plus sign (New Tab) presents more New Tabs than what shows when returning to New Tab screen

* Only respond to new tab clicks if not in transition and the current screen is TABS_Screen to prevent multiple empty tabs from created
Bug 1069188 - [NFC] NfcManager not passing sessionToken to activities, r=gweng
Bug 1061440 - Provide an option for restoring only apn items instead of the entire apn settings

Conflicts:
	apps/settings/js/modules/apn/apn_settings_manager.js
 Bug 1062730 - [NFC] Home button could not work well after receiving multiple websites which are shared via NFC
1. publish activeappchanged when app is changed in app_window_manager.js
2. stop tiltiing effect if receiving activeappchanged event
Bug 1065943 - [Text Selection] Hide utility bubble when scrolling and show bubble when scroll end - gaia part
Bug 1065302 - Contact phone numbers and phone type should always be separated with a comma
Bug 836690 - Follow up: Add localization comment for sms segments information string. r=flodolo
Bug 1067297 - [WAP Push] Implement Warning Prompt when a WAP Push message containing APN settings is received
Merge pull request #24318 from begeeben/1011669_double_tapping_on_plus_sign_master

Bug 1011669 - [B2G][Browser]Double-tapping on plus sign (New Tab) presen...r=benfrancis
Merge pull request #24221 from gitmai/bug-1067297-WAPPUSH-warning-prompt

Bug 1067297 - [WAP Push] Implement Warning Prompt when a WAP Push messag...
Revert "Bug 1063685 - Fix lookup for browser windows. r=alive"

This reverts commit a0fa29db8e9e15afe3b1787bf494caa86a033f10.
Merge pull request #24150 from ddrmanxbxfr/bug_1062806

Bug 1062806 - Use the new shared helper for loading JSON files in the co..
Merge pull request #24211 from tauzen/Bug1069188_sesssion_token_removal

Bug 1069188 - [NFC] NfcManager not passing sessionToken to activities, r=gweng