Bug 1023784 - [7715][calendar] create/modify/view event L10n
Bug 995458 - Only calls the last callback of an async operation r=jaoo, a=1.4+
Bug 1026475 - Device switch from Handset/Headset to BTSCO fails during call, r=etienne, a=1.4+
Revert "Bug 997601 - Save the caller id preferece across reboots"

This reverts commit e57407520733fad1aea349613d647a4a313c1311.
Bug 1019359 - Use pointer-events: auto in edit mode so that we don't trigger the checkboxes that are below the buttons r=julien,arnau
Merge pull request #20723 from bentian/bug-1026475-14

Bug 1026475 - Device switch from Handset/Headset to BTSCO fails during call, r=etienne, a=1.4+
Merge pull request #20518 from millermedeiros/1023784-offline-calendar

Bug 1023784 - [7715][calendar] create/modify/view event L10n r=gaye
Bug 1024692: limit image decode size to 3mp on 256mb devices
Bug 1014918 - [FTU][Sim Manager][Flame] 'No operator' is shown when a SIM has PIN
Merge pull request #20643 from dmarcos/bug1024692

Bug1024692
Merge pull request #20525 from asutherland/email-as-dev-id

Bug 825538 - [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync. r=squib
Merge pull request #20712 from davidflanagan/bug1026846

Bug 1026846: require the type parameter for FL app view activity r=amac
Merge pull request #19762 from frsela/STK/Bug1015833

Bug 1015833 - [PTCRB][STK]27.22.4.1.1/2 DISPLAY TEXT, normal priority, Unpacked 8 bit data for Text String, screen busy case failed, r=vingtetun
Merge pull request #20887 from gmarty/Bug-1014918-No-operator-shown-when-SIM-has-PIN-v1.4

Bug 1014918 - [FTU][Sim Manager][Flame] 'No operator' is shown when a SIM has PIN
Merge pull request #20792 from crh0716/1022710

Bug 1022710 - Do not update the visibility of the items when the voice type is null r=eragon
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
Merge pull request #20791 from mnjul/bug_1027536_lockscreen_clock_stall

Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled. r=gweng
Conflicts:
	apps/system/js/lockscreen.js
Revert "Merge pull request #20791 from mnjul/bug_1027536_lockscreen_clock_stall"

This reverts commit fcc1d87b8529a8eec109b2aa5cf57129c46904fd.
Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled
Bug 995886 - Homescreens overlap when process is killed when screen is off