Bug 1069184 - [ftu] unittest navigation_test.js incorrect using assert.include for testing existing object property
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 1070890 - [Messages][Refactoring] Make use of EventDispatcher in Compose. r=schung
Bug 1070905 - (way) Better Cards View performance
Bug 1070918 - [Dialer] Intermittent failure with newer mocha r=rik
Bug 1070914 - [Contacts] [Settings] SIM Import label has disappeared
Bug 1068722 - Update camera tests to check if the switch source action had happen
Bug 1068651 - [Contacts] [ICE] In occasions the ICE Group and Contact Settings info is not correctly updated
Bug 1062806 - Use the new shared helper for loading JSON files in the cost control app
Bug 971486 - [System2] Instantiable EdgeSwipeDetector r=alive
Bug 1069236 - fix attention notification style
Bug 1051100 - [B2G] [Homescreen] Multiple lines are displayed when moving apps to the bottom of the Homescreen

* Before adding a horizontal divider in edit mode on the vertical homescreen, check if one is needed.
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 1067264 - Remove delay of layout/IME deactivation in built-in keyboard app as a follow-up of bug 1057898

- The need for delaying deactivation is no longer needed after bug 1057898 and bug 1067266.
- StateManager.DEACTIVATE_DELAY is removed.
- In deactivation, propogatation the triggering of setTimeout callback (of the delay), in forms of resolution of Promises, is removed. Async codes made into sync codes.
- Unit test cases regarding rapid activation after deactivation, and vice versa, are removed, since the behavior should now be guarded by Gecko.
 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