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 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 1023663 - [User story] Calendar day view should start at 8 AM r=millermedeiros
Merge pull request #22352 from evanxd/bug-1023663

Bug 1023663 - [User story] Calendar day view should start at 8 AM r=millermedeiros
Bug 1048005 - [EverythingMe] CDN urls for web results icons. r=me
Merge pull request #22455 from EverythingMe/1048005-cdn-icons

Bug 1048005 - [EverythingMe] CDN urls for web results icons
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.
Merge pull request #22702 from AkshayTiwari/master

Bug 1006990 - Remove broken applicationCache handling in notification.js, r=timdream
Merge pull request #22410 from mnils/Bug-1047126

Bug 1047126 - Keyboard transition should not overlap the soft home key bar, r=timdream
Merge pull request #21809 from yurenju/preferences

Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=@gduan
Merge pull request #22666 from crh0716/1044405

Bug 1044405 - Should set a empty string if there are no text and l10n provided. r=alive