Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable
(cherry picked from commit f2e1981e5ac09b72e1e8ffcbc0f5f6c42cb92037)
Bug 894734 - [Buri][Lancher]The time icon in status bar will lost when change language
Bug 890004 - Completion of UA override changes for B2G 1.1 r=fabrice
Merge pull request #10566 from leob2g/Bug_885927_Adding_String_Localize_for_Edit

[885927][Calendar]Edit string adding to locale files for localization. r=lightsofapollo
(cherry picked from commit 18d39f8bbf25905da1bd1df6147d815bda1052db)
Merge pull request #10983 from gaye/bug-889396

Bug 889396 - Sync button went away r=lightsofapollo
(cherry picked from commit ab895af6425ed0100afa1d3d9871126e3f4552df)
Merge pull request #10991 from jlebar/gaia-event-listener-leak

Bug 894081 - (Try to) fix a leak in Gaia by registering its mozbrowserer...r=alive
(cherry picked from commit d85dbb240e000903c9cb0a7a1f8aff45b3592e28)
Merge pull request #10967 from frsela/STK/Bug893614

Bug 893614: [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. r=timdream
(cherry picked from commit c340cc85151a3387746c1e0cf742bb8c2e8b09fb)
Merge pull request #10968 from huchengtw-moz/camera/Bug_881664_camera_pick_pitfall

Bug 881664 - Camera 'pick' pitfall when there is no sdcard. r=daleharvey(cherry picked from commit cdf71136ae6233cb790e9f9be16ae456726e38c1)

Conflicts:
	apps/camera/index.html
	apps/camera/style/camera.css
Bug 894747: Remove bg color to avoid launch flash

Note:  This is a partial uplift of 7f27d41a9.
Merge pull request #11027 from huchengtw-moz/system/bug_888821_ua_profile_configuration_based_on_mcc_mnc

Bug 888821 - B2G MMS: UA profile configuration based on MNC and MCC. r=archurcc(cherry picked from commit 4ec7c428f6a63a44f888ea6f6ade0385c89ae305)

Conflicts:
	apps/system/js/operator_variant/operator_variant.js
Merge pull request #11021 from huchengtw-moz/system/bug_894734_time_icon_in_status_bar_disappeared-v1-train

Bug 894734 - [Buri][Lancher]The time icon in status bar will lost when c... r=@alivedise
Bug 814840 - For v1-train remove isRunningFirstRunApp
Merge pull request #11060 from alivedise/bugzilla/814840_v1-train_missing_part

Bug 814840 - For v1-train remove isRunningFirstRunApp
Merge pull request #11061 from dominickuo/revert-bug-857674

Revert "Bug 857674 - [music] hide sublist and player before entering to search mode"(cherry picked from commit 8c4291690c9bca6632317335253f6a1b8277f345)
Revert "Merge pull request #10967 from frsela/STK/Bug893614"

This reverts commit f1d2e3fd806dc55f167c72ac8ef7a3b6baed915e.
Merge pull request #11068 from dominickuo/bug-857674-new

Bug 857674 - [music] hide sublist and player in search mode, r=RudyLu(cherry picked from commit 2eea445c6a900c4d65fee5d8e27e5cd2be85054a)
Merge pull request #10456 from gtorodelvalle/dialer-bug-883756-contact-details-from-call-log

Bug 883756 - [Call log] Tapping on an entry from a contact does not take to that contact's detail view screen but to a different one (r=arcturus)
(cherry picked from commit faadeec569bce9be9b1e8859b351ac7878a080c7)
Merge pull request #11014 from wanderview/contacts-update-delete

Bug 894302: Support contact delete during update activity.  r=arcturus
(cherry picked from commit fd7fcddab555d88d883f783782949d599f52ab5a)
Merge pull request #10995 from crh0716/886245

Bug 886245 - Ignore calls to openCallScreen when it is already executing r=etienne, a=leo+
(cherry picked from commit 3411f0b09f1643e7d95766593cbbc3eff7cdd7e6)
Merge pull request #11036 from frsela/STK/Bug895237

Bug 895237: [STK] dummy function problem in icc.js. r=timdream
(cherry picked from commit 9e5a606d86605f6cb7f61ae307df4e6f33a83d4f)