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 1048772 - Incorrect value in "app.update.battery-threshold.plugged" and "app.update.battery-threshold.unplugged" are allowed
Bug 1049566 - [NFC] add missing unit tests for NfcManager, r=gweng
Bug 1030431 - correctly handling dialog overlay visibility in the dialer and callscreen apps.
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 1045515 - Always highlight missed calls in call log
Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Bug 1050396 - Properly handle zero duration in ring command.
Bug 1042012 - [Rocketbar] View URL activity should be handled by the system app r=vingtetun r=yurenju r=qdot
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
Bug 1048141 - [v2.1] After importing contact from gmail the import screen does not disappear
Bug1049842 - Change downloadUdatesVia2GForbidden text
Bug 1040881 - Searching doesn't work on contacts with middle names
Bug 1050196 - [Dialer] Follow up of bug 1024506 - Place new call button momentarily enabled while establishing a second call
Merge pull request #22661 from ADLR-es/1048141-fix

Bug 1048141 - [v2.1] After importing contact from gmail the import scree...