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 997601 - Save the caller id preferece across reboots r=jaoo, a=1.4+
Merge pull request #20750 from RudyLu/keyboard/Bug1015541

Bug 1015541 - choosing a word suggestion after moving the caret changes the wrong text
r=janjongboom
(cherry picked from commit 73b9c780c54ec1c6fcf47c2ce467672d3c5aaded)
a=1.4+

Conflicts:
	apps/keyboard/js/keyboard.js
Bug 994176 - Create branched versions of marionette-client and consumer packages. r=zcampbell
Bug 987946 - [unittest] test_cold_launch.py failing

The test is failing because the correct app url is now not available until
shortly after launching.
This patch changes the test so it waits for the correct app url, rather than
just immediately asserting that it is as expected.
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...