Bug 1036830 - build failed if camera-config.js in distribution directory doesn't exist r=gduan
Bug 1047126

Keyboard transition should not overlap the soft home key bar.
Bug 1042080 - [Settings][FTU][EverythingMe] 'Your Privacy' page shows outdated EverythingMe branding r=ranbena
Bug 1049566 - [NFC] add missing unit tests for NfcManager, r=gweng
Bug 1048953 - Calendar Day view fails when hour is 00:xx JavaScript error: app://calendar.gaiamobile.org/js/views/current_time.js, line 115: displayHour is null
Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Bug 1050396 - Properly handle zero duration in ring command.
Bug 1050402 - Should not skip the current navigation when there is a pending one
Bug 1048711 - L10N with device type follow up
Bug 1044405 - Should set a empty string if there are no text and l10nid provided
Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=gduan

Conflicts:
	build/preferences.js
Bug1049842 - Change downloadUdatesVia2GForbidden text
Bug 1050196 - [Dialer] Follow up of bug 1024506 - Place new call button momentarily enabled while establishing a second call
Bug 1050801 - Update shared/elements/gaia-header/ to ~v0.3.0
Bug 1050861 - Use version 2.4.1 for tornado in gaia unit tests
Bug 1048021 - Mass replace pageX and pageY to clientX and clientY for keyboard app.
Merge pull request #22041 from EverythingMe/1042080-privacy-branding

Bug 1042080 - [Settings] [EverythingMe] 'Your Privacy' page shows outdated EverythingMe branding
Update notifications.js

Regarding the bug no. 1006990 .
Gaia apps was loaded with app cache, and we have switched to packaged app long time ago. However, there are still redundant code in the top of apps/system/js/notification.js on saving notification icons.
So removing the app cache code.
Bug 1048308 - Part 1 - Move Everything.me mock server into shared/. r=Cwiiis
Bug 1048308 - Part 2 - Add MarionetteJS Test for bookmarking Everything.me result r=Cwiiis