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
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 894978 - Correct background image dimensions in browser about page
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)
Merge pull request #10442 from fcampo/mms-photo

Bug 882593 - [MMS] Multirecipient. Contact's picture is not shown when the group participant info is displayed
(cherry picked from commit af0e322d36d2a863afd05d0ead5a9e8fd8254f7a)
Merge pull request #11050 from fabi1cazenave/i18nDefaultMediaLocation-bug892788

Bug 892788 - [Settings] "Cancel" and "Change" are not localized r=arthurcc
(cherry picked from commit 799f7a6df44cc2085f7fe697870bc4f842af88f0)
Merge pull request #10993 from leob2g/Bug_894205_Usage_Graph_Line_Is_Not_Shown_At_End

Bug 894205 -[CostControl] Usage Graph is not shown at the end
r=lodr
(cherry picked from commit 7d79755fca61ca54cc5d31f6be57e2bcd721c5d2)
Merge pull request #10476 from crh0716/881727_v2

Bug 881727 - Move the type of switch controls to the top level element. r=lightsofapollo, jmcf, fcampo, daleharvey, salva, asuth, timdream, schung, kaze, basiclines, etienne(cherry picked from commit 6e4ff7535ecad23252fc8360bdc92d27be1c2ee0)

Conflicts:
	apps/communications/contacts/test/unit/mock_contacts_index.html
	apps/communications/dialer/test/unit/calllog_test.js
	apps/communications/ftu/index.html
	apps/email/js/cards/msg/header_item.html
	apps/email/js/cards/settings_account.html
	apps/email/js/cards/settings_main.html
	apps/settings/index.html
	apps/settings/js/sound.js
	apps/settings/style/lists.css
	shared/style/switches.css