Merge pull request #11048 from comoyo/vcf-encoding

Bug 883278 - [contacts] importing from .vcf file (sd card) puts providedfirstname and lastname in firstname field if both contain only ascii characters, causes sort by lastname to fail [r=arcturus]
(cherry picked from commit bbad03e30527e1df8261a462e5cefbdc562f0819)

Conflicts:
	apps/communications/contacts/js/utilities/vcard_parser.js
Bug 899328 - Register only one listener for mozbrowserloadend and appopen on a given app iframe.

This prevents us from leaking listeners.
Bug 858463 - Hide the subtitle Accounts if there is no account in settings (cherry picked from commit c542dd1)
Bug 898804 - Remove the whitespace in settings page.
Merge pull request #11238 from jlebar/apploaded-listener-b2g18

Bug 899328 - Register only one listener for mozbrowserloadend and appopen (v1-train PR)
Merge pull request #9868 from RudyLu/keyboard/catalan_support

Bug 866746 - Catalan keyboard layout r=RudyLu(cherry picked from commit 1419f08968e1a4b746579af39c9e2dbb44c0cf9d)

Conflicts:

	apps/settings/index.html
	shared/resources/keyboard_layouts.json

Merge pull request #9888 from gaye/bug-866746-followup

Bug 866746 - Fix lint errors introduced by 1419f0 r=RudyLu(cherry picked from commit 26701c886c262a40ffb9bcca3121204575baa922)

Conflicts:

	apps/keyboard/js/render.js

remove unused layout property
Merge pull request #11272 from davidflanagan/bug866746-v1-train

Bug866746 v1 train
Merge pull request #11231 from davidflanagan/bug896363

Bug 896363: Add an auto-correct dictionary for Catalan r=RudyLu(cherry picked from commit 247eec1e8cf4a5ccb4077ecc3e48dd3bda6ef108)

Conflicts:

	apps/keyboard/js/keyboard.js
Merge pull request #11273 from davidflanagan/bug896363-v1-train

Bug896363 v1 train
Merge pull request #11202 from davidflanagan/bug896907

Bug 896907: let the user preview a captured video before picking it r=daleharvey,johnhu(cherry picked from commit 862de8489b648a9af7e8a5b88be031b5479404ba)

Conflicts:

	apps/camera/js/camera.js
	apps/camera/style/filmstrip.css
Merge pull request #11278 from davidflanagan/bug896907-v1-train

Bug896907 v1 train
Fix advanced settings view test

(cherry picked from commit 4604744bdb982d383df98f70a408a280314dacb5)
Add missing semicolon to end of line in advanced settings view

(cherry picked from commit c952f77de9768b18fb77c29a0eeaba0e574b4228)
Merge pull request #10951 from KevinGrandon/bug_893188_fix_system_messages

Bug 893188 - Update system message manager r=vingtetun
(cherry picked from commit 2f7fc2d436f3418bf6bcabac84a5f0701b48ef55)
Merge pull request #9326 from pauljt/bug863527_v2

Bug 863527 -- Safer html injection in app error, r=alive
(cherry picked from commit fcda94c9f9776c2ae181f78a3471e012db9e04a1)
Merge pull request #11104 from cctuan/896594

Bug 896594 - [B2G][Leo][Settings]Display: The brightness adjustment slider is unresponsive. r=arthurcc
(cherry picked from commit 8574aeec5cd13f0ed2460b51768599e26f722b28)
Merge pull request #11063 from steveck-chung/bug-891785

Bug 891785 - [MMS] smil.parse doesn't work well if message.attachments is null. r=gnarf
(cherry picked from commit 94bd91967d99ceb9e072486fc91687c221628e6d)
Bug 896825: Call the closeCallback even if the close transition has been
cancelled. r=alive

(cherry picked from commit 3d64d2aefaa80919d183c95c2fd95a94f2b7702a)
Merge pull request #11164 from alivedise/bugzilla/897874/notification-disappearing

Bug 897874: Delay the notification transition before event handler, r=timdream, a=leo+
(cherry picked from commit a3d7268219f6ff92d296a3305bdfef14209885dc)
Bug 897036 - Dialer app remains at 10% loading when test_call_log_all_calls is run. r=francisco

(cherry picked from commit 1d308bd461365ed305aeb6f30743a39aab22d00d)