Bug 980217 - Make "Skip" and "OK" buttons show when entering SIM 2 PIN code on v1.4. r=Alive
Bug 991906 - [B2G][Homescreen] Long pressing an App that opened in Landscape mode will cause the Dock apps to shift

Conflicts:
	apps/homescreen/js/grid.js
Bug 995886 - Homescreens overlap when process is killed when screen is off
Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
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 #21069 from nullaus/bug1022804

bug 1022804 - Clear all references of a successful download from the Dow...
(cherry picked from commit ddfea87310513b5499200175c752ad14cf044bf7)
Merge pull request #21119 from nullaus/v1.4

Merge pull request #21069 from nullaus/bug1022804
Bug 1031144 - [Camera] unable to load camera on passcode lock screen when camera was launched before locking device
Merge pull request #20892 from dominickuo/bug-998956-3

Bug 998956 - [MediaDB] Ignore the time difference when it is multiple of 10 minutes and less than 12 hours, r=davidflanagan
Merge pull request #21125 from justindarc/bug1031144-v1.4

Bug 1031144 - [Camera] unable to load camera on passcode lock screen whe...
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 #20927 from comoyo/bug995886_v1_4

Bug 995886 - Homescreens overlap when process is killed when screen is off
backport fix to Bug 1004138 - Add a step to cleanup_data to eliminate remembered networks
Merge pull request #20699 from dchunwong/upliftwifi

Backport fix to Bug 1004138 - Add a step to cleanup_data to eliminate remembered networks
Merge pull request #21173 from steveck-chung/bug-1022644-for-v1.3t

Bug 1022644 - [Messages] Can't open the recipient panel if there are only 2 lines of recipients. r=azasypkin(cherry picked from commit 366bf651ac320c8ccc458f08ece01f2b8aadfa1c)

Conflicts:

	apps/sms/test/unit/recipients_test.js
Bug 1028835 - [dolphin][flame] video list display abnormal for a while when switch between landscape mode and portrait mode