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 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 1042012 - [Rocketbar] View URL activity should be handled by the system app r=vingtetun r=yurenju r=qdot
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
Merge pull request #22661 from ADLR-es/1048141-fix

Bug 1048141 - [v2.1] After importing contact from gmail the import scree...
Merge pull request #22560 from ADLR-es/fix-bug-1040881

Bug 1040881 - Searching doesn't work on contacts with middle names
Merge pull request #22568 from empoalp/bug_1045515

Bug 1045515 - Always highlight missed calls in call log
Bug 1023663 - [User story] Calendar day view should start at 8 AM r=millermedeiros
Bug 1050541 - [Camera] HDR and timer icons don't display correctly
Bug 1050339 - [B2G][Smart Collections] Default Smart Collections are missing their icons r=yurenju
Bug 1050423 - Killing an app that has an open permissions dialog leaks the ContentParent r=alive
Merge pull request #22643 from KevinGrandon/bug_1042012_rocketbar_activities

Bug 1042012 - [Rocketbar] View URL activity should be handled by the system app
Bug 1033392 - [Settings] Factor out .disabled class, use in HUD. r=21,eragonj