Bug 849205 -[Cost Control] Align Cost Control first time setup with FirefoxOS first time usage
Bug 967413 - [Download Manager] Select a download from the edit mode is not consistent with SMS edit mode
Bug 913552 - [Cost Control] Grid numbers are too close to the left edge of screen
Bug 980877 - Directly deleting picture taken does not work
Bug 978371 - Fix editing bookmark URLs
Bug 981943 - Add database close to upgrade error in clock database. Fix event name typo.
Bug 965139 - [Email] Acquiring a wifi wakelock while sending an email

comment spaces
Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows

after enter incorrect PIN code three times.

- update logic
- add unit test
Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen
Bug 980984 - Alert the user of an incoming from the system app to improve performance.
r=alive, rik
Bug 981277 - Remove a sync reflow when using the cards view. r=etienne
Bug 968918 - [B2G][Everything.me][Smart Collections] Revert to Default Icon [r=ranbena]
Revert "Merge pull request #15774 from wanderview/opus-json"

This reverts commit 6f968274d05ba8cf30b8b9c45b50b3f2ca220af7, reversing
changes made to 09ae464cb04f056aaf8272636a9d4f51f5f9a395.

Conflicts:
	apps/communications/ftu/test/unit/resources/customization.json
Merge pull request #16992 from etiennesegonzac/bug-980984-incoming-alert-from-system

Bug 980984 - Alert the user of an incoming from the system app to improve performance.
r=alive, rik
Merge pull request #17004 from EverythingMe/968918-revert-collection-icon

Bug 968918 - [B2G][Everything.me][Smart Collections] Revert to Default I...
Merge pull request #17027 from wilsonpage/bug/980877

Bug 980877 - Directly deleting picture taken does not work
Bug 981441 - DST bug in day_view_test.js results in "TEST-UNEXPECTED-FAIL | day view events longer than 2h click after event end" during the day daylight time begins
Bug 982048 - Xfail test_email_keyboard.py with bug 982113
Merge pull request #17001 from vingtetun/bug981277

Bug981277
Bug 982134 - Skip test_clock_set_alarm.py with Bug 982128