Merge pull request #15271 from jimporter/music-fix-seek-after-long-press

[Bug 951972] [music] cannot change progress bar after long tapping on "Random Play" icon; r=dkuo
(cherry picked from commit 8d18b1e2fd06c84a879f99f6e8ca1f104eeacb13)
Merge pull request #15735 from jaoo/964345

Bug 964345 - [DSDS] Wrong panel navigation flow for call settings and cellular and data menu items. r=arthurcc
(cherry picked from commit 719c2650a53dcfa22689898cb82c3826d17eb1b2)
Merge pull request #15675 from crh0716/959962

Bug 959962 - Set correct width based on the padding r=alive
(cherry picked from commit b27bc4195df919b244d56873c7fe3d47d4c04e5e)
Merge pull request #15760 from crh0716/943227

Bug 943227 - Stop using emergencyCallsOnly attribute r=alive
(cherry picked from commit 04c6d23125dd52b1ca4b9c33be1344ffe33e8c5d)
Merge pull request #15728 from crh0716/962452

Bug 962452 - Restore the automatic selection settings when navigating to the panel r=jaoo
(cherry picked from commit b4860ec2f3829c57f68792a0cc6875065bf6c3b0)
Merge pull request #15790 from gasolin/issue-964450

Bug 964450 - [E.me]let entry not overlap by menu while keyboard pop, r=alive
(cherry picked from commit ea7971a9f5bbf63a3977161f09ce7138202c7c62)
Merge pull request #15763 from crh0716/958547

Bug 958547 - Hide the signal bars if the sim card is locked r=alive
(cherry picked from commit 5f9da9170e2d6b3923bc4c1b1fcaa4fd8b553cff)
Merge pull request #15726 from jaoo/962912

Bug 962912 - Custom APN fail to apply if default APN does not exist. r=kaze
(cherry picked from commit 40d05ad9377cc176e9cd097082ef78a73688e4b1)
Merge pull request #15799 from gtorodelvalle/contacts-bug-965168-exporting-to-sd

Bug 965168 - [Contacts] Export contacts to SD card is not working
(cherry picked from commit a2efa6486cc1561fad5196881c6753bd09dd93d5)
Merge pull request #15679 from arcturus/bug-957338

Bug 957338 - [Contacts] When viewing contact details from the Messages app (via Activity) the chat icon is not functional and not disabled either
(cherry picked from commit 57ff25637a82ab816039604018b619c2fb17a5f4)
Merge pull request #15656 from arcturus/bug-962215

Bug 962215 - [B2G][Contacts]Unable to import contacts from the SD card.
(cherry picked from commit 994bf56beaa04bb63a5a0448a0a82ac93f399502)
Bug 963037 - Bring up PUK entry when PIN entry retries run out; r=mhenretty

(cherry picked from commit fbe5fb9710530d2d540d626852b6599387ec53a4)
Bug 957714 - [Messages] Interacting with message field prevents recipients field from stealing focus (cursor jump) r=julienw

https://bugzilla.mozilla.org/show_bug.cgi?id=957714
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Merge pull request #15727 from gtorodelvalle/contacts-bug-962989-message-to-Facebook-contact

Bug 962989 - [messages] sending message to a Facebook contact doesn't work (r=jmcanterafonseca)
(cherry picked from commit f856ac26063e5462efad3cf13a46b35c6686af5b)

Conflicts:
	build/jshint/xfail.list
Merge pull request #14578 from gitmai/bug-948824-CC-remove-icchelper

Bug 948824 - [CostControl] [DSDS] Remove IccHelper
r=salva
(cherry picked from commit 33e4a0f4e242b54c91eb8a1f5f91efada5252565)
Merge pull request #15654 from jaoo/962453

Bug 962453 - [DSDS] Once visit APN setting of one SIM, same APN of another SIM will be changed to "Custom". r=arthurcc(cherry picked from commit 4d0b2ffaf044a20b5bea9d7d85d4ecc5a71080fd)

Conflicts:
	apps/settings/elements/carrier_data_settings.html
	apps/settings/elements/carrier_mms_settings.html
	apps/settings/elements/carrier_supl_settings.html
Bug 963173 - Ensure address bar is always displayed when a different tab is selected. r=daleharvey
(cherry picked from commit ac0692fcd9bc59508dc978591cc380f8dcdc7873)
Merge pull request #15815 from davidflanagan/bug956811

Bug 956811: ugly workaround that abuses the settings db for interapp communication r=jporter(cherry picked from commit 2c64a463f6bb053a05326ee1b6c5236eb31b898c)
Merge pull request #15873 from davidflanagan/bug956811-v1.3

Merge pull request #15815 from davidflanagan/bug956811
Merge pull request #14547 from davidflanagan/bug946519-v1.2

Bug 944276: MMS workaround for problem with memory-backed blobs r=julienw(cherry picked from commit bd559ee748be267a80fff2bbdbd887c85af06eba)

add global comment to keep jshint happy