Bug 995458 - Only calls the last callback of an async operation r=jaoo, a=1.4+
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
Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim.
Merge pull request #20872 from crh0716/1023044_v1.4

Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim. r=alive
Merge pull request #18736 from alivedise/bugzilla/1002316_v1.3t_real/sound-manager-home-event

Bug 1002316 - Homescreen event should be caught by sound manager, r=timdream
Merge pull request #20124 from timdream/keyboard-dbltap-back-v1.3t

Bug 1020628 - (1.3t) Don't allow user to start activity twice in keyboard settings +shepherd
Conflicts:
	apps/keyboard/js/settings/settings.js
Merge pull request #20951 from mnjul/bug_1027536_lockscreen_clock_stall_v1.4

Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled
Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in camera, there will be a cropping issue towards the end of the video