Bug 995458 - Only calls the last callback of an async operation r=jaoo, a=1.4+
Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in camera, there will be a cropping issue towards the end of the video
Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
Merge pull request #21003 from jimporter/email-as-download-body-failure

Bug 1009422 - [email/Activesync/hotmail] Apparent change in server behav...
Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after failed cronsync(s) r=mcav
Conflicts:
	apps/email/js/cards/compose.js
Merge pull request #20718 from crh0716/995458_v1.4

Bug 995458 - Only calls the last callback of an async operation r=jaoo, a=1.4+
Bug 992346 - Inline keyboard symbols font
Merge pull request #18966 from timdream/two-homescreen

Bug 996514 - Don't homescreenWindow.render() twice, r=alive
Conflicts:
	apps/system/js/app_window.js
Merge pull request #20993 from justindarc/bug1014968-v1.4

Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in came...
Revert "Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe"

This reverts commit e68f589db4de9355c3ab1896e6f70d63d7d82809.
Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s)

From master commit e64d7adf507d0f0164988257d30600499b1e5776

Conflicts:
	apps/email/js/cards/compose.js
Merge pull request #21073 from jrburke/bug1025727-v1.4-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s) r=mcav a=bajaj
Merge pull request #21046 from arcturus/bug-987966

[DO NOT MERGE YET] Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
Merge pull request #18049 from etiennesegonzac/bug-993018-place-new-call-activity

Bug 993018 - Replace the "place new call" postMessages with a WebActivity r=rik
(cherry picked from commit d2a70ab329a0f85a1a7fd38c7c9297abd763ee1e)
Merge pull request #18044 from etiennesegonzac/bug-992948-sysmsg-call-log

Bug 992948 - Use the telephony-call-ended sysmsg to record calls r=rik
(cherry picked from commit 04a7f8d951d1ed8bdbe5eaea75b3204792d24fa4)
Merge pull request #18201 from etiennesegonzac/instacallscreen

Bug 990003 - Introducing a dedicated callscreen app for better performance r=rik, alive, 21
(cherry picked from commit 7afce8a6e965a45f38988227828ccdfb315394f3)

Conflicts:
	apps/communications/dialer/js/call_log.js
	apps/system/js/attention_screen.js
	apps/system/js/bootstrap.js
	apps/system/style/attention_screen.css
	apps/system/test/unit/bootstrap_test.js
	build/csslint/xfail.list
	build/jshint/xfail.list
	build/webapp-zip.js