Bug 877062 - Prevent cardview when ftu running
Merge pull request #9859 from RudyLu/settings/Bug869879-input_password_pincode

Bug 869879 - enable keyboard app to show pinLayout when type=password. r=djf, Arthur, fcampo.(cherry picked from commit 8eec8e331ec58e0a1b3d0b926d0aaa0d0b50f477)

Conflicts:
	apps/keyboard/js/keyboard.js
	apps/keyboard/js/layout.js
	apps/settings/index.html
	apps/settings/style/simcard.css
	apps/system/index.html
	apps/system/js/simcard_dialog.js
	test_apps/uitest/tests/inputmode.html
	test_apps/uitest/tests/keyboard.html
Bug 872588 - Make mozSettings works again with the browser-helper extension. r=ochameau
(cherry picked from commit 68a0d752be643a2a86e420239b77236b4c2195a8)
Bug 877167 - [SMS][Regression][v1-train] Edit mode styles are broken. 'Red square' sourrounding the text should be removed r=julien
Bug 862402 - Check the connection status before we reconnect the device
Merge pull request #10057 from alivedise/bugzilla/877062_v1-train/ftu-home

Bug 877062 - Prevent cardview when ftu running, r=timdream
Merge pull request #10020 from lissyx/bug847459

Bug 847459 - Replace Bluetooth device name with default when empty name given(cherry picked from commit 55e7cf33b951406f8d6124e237177f7b43898a81)
Bug 870892 - [MMS] [UX] Thread list. The attachment icon is croppped - r=julienw

Attachment icon uses its own <span> element now that is only displayed in [data-last-message-type='mms'] threads
Body text is hidden for mms, so we don't need to fix the 'undefined' bug
(cherry picked from commit 267ec4ee2d3bb409584c489a0b105cb34eaf3821)
Merge pull request #10059 from bakulf/videowl

Bug 868325 - 'screen' wakelock removed from gaia when VideoElements are used(cherry picked from commit 2970582d0ed5f5514090fa53429c2ed5db6eea1d)
Merge pull request #9803 from mcirlanaru/bug_871425

Bug 871425 - [Dialer] Truncate long carrier name with ellipsis when ... r=@etiennesegonzac(cherry picked from commit c7f7636510a3a62e21d81107fd4e3ba7bb501854)
Bug 870915 - [MMS] [UX] Compose: Contacts suggestions is wrong implemented - r=gnarf37

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

Closes gh-9889
(cherry picked from commit 4ddf8646f9687745de4eea838b4e69469c2f9220)
Merge pull request #9952 from albertopq/dialer-missed-highlight

Bug 875238 - First time going into the call log, the not seen missed calls are not highlighted r=gtorodelvalle(cherry picked from commit 0256a3c3123b20a534f0a31a9621105c707e5032)
Bug 874430 - [MMS] [UX] Compose. Apply "+ add contact" button hit state r=julienw
(cherry picked from commit 12a0576f4fd4615d21e4a284723733791c070c71)
Merge pull request #9930 from leob2g/Bug_866685_ResetReport_Button_Localization_Error

Bug 866685 - ResetReport_Button_Localization_Error r=lodr(cherry picked from commit 8abc8d77776dae8c9f9f23a1494008e2ba4297b4)
Merge pull request #9959 from leob2g/Bug_875265_Invalid_ICCID_Handling

[Cost Control] Bug_875265_Invalid_ICCID_Handling
r=lodr(cherry picked from commit f23775cbac7036635ac0f30dad1b84b62807f65f)
Bug 873033 - [MMS] [UX] Messages thread view. Correct the line height for text inside msg bubbles r=gnarf37
(cherry picked from commit f63c63fbd2bfd1cd4e489be975b78ff1060bafdf)
Bug 871055 - [MMS] [UX] Thread view. Wrong spacing between Image thumbnail and text below it r=julienw
(cherry picked from commit fd1ddaedc0e7703d796e9dff3d1d24cba8c5490b)
Bug 873498 - Fix tests due to bad rebasing r=schung
(cherry picked from commit 9885fc228d8b1f4cac9151d3d3afb37298b2c3cb)
Merge pull request #10058 from asutherland/email-offline-during-body

Bug 876622 - [email/IMAP] snippet fetching logic does not handle connection loss correctly. r=squib(cherry picked from commit 5e5931544ba45d32c65a21cfce74e8c1df126869)
Merge pull request #10060 from asutherland/email-body-search

Bug 868270 - [Email] Email Body search filter is broken, always shows empty. r=asuth(cherry picked from commit be269ce7cba62e20fbd5d555260dc657791f51a6)