Bug 892950 - error-network message can use better English
Bug 949796 - brief flash of tiny buttons after focusing e.me search box on homescreen [r=ranbena]
Revert "Bug 922463 - Part 2: Modified httpd extension for multilocale.js"

This reverts commit bb7d576483f16e2ac76e6303279a6098c0333212.
Revert "Bug 922463 - Part 1: rewrite build/multilocale.py in javascript"

This reverts commit 43c7463d99e072c5d7d74a73a125a7bb3a8da329.
Merge pull request #14913 from gurumukhi/patch-2

Bug 892950 - error-network message can use better English, r=johu
Bug 952899 - Fix test_receive_active_sync_email.py
Bug 922463 - rewrite build/multilocale.py in javascript
Bug 945096 - Re-implement locked call screen with canvas
Merge pull request #14928 from yurenju/multilocale-3

Bug 922463 - rewrite build/multilocale.py in javascript r=@timdream r=@ochameau r=@Pike
Merge pull request #14762 from steveck-chung/incoming-call-slider-modulize

Bug 945096 - Re-implement locked call screen with canvas. r=etiennesegonzac, a=1.3 blocking+
944288 [UITEST] add image share activity - bug fixed
Bug 949338 - The candidate panel of Asian language input methods are rendered incorrectly - bug fixed
Revert "Revert "Merge pull request #14037 from timdream/keyboard-oop-reenable""

This reverts commit 03e6e87c7e1b740e2968bbab675600ead2cca84a.
Merge pull request #14931 from kumarrishav/issue-944288

Bug 944288 [UITEST] add image share activity - bug fixed, r=gasolin
Merge pull request #14917 from EverythingMe/949796-unstyled-flash

Bug 949796 - brief flash of tiny buttons after focusing e.me search box ...
Merge pull request #14926 from askeing/952899

Bug 952899 - Fix test_receive_active_sync_email.py
Bug 935391 - Better light sensor behavior to reduce the flicker
Merge branch 'bug935391'

Manual merge and close #14919
Bug 933035 - [B2G][System][Lockscreen] The phone goes to sleep on the lockscreen even though screen timeout is set to never
Merge pull request #14936 from kumarrishav/issue-949338

Bug 949338 - Update candidate panel visual, r=timdream, f=luke