Bug 898804 - Remove the whitespace in settings page.
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)
Merge pull request #11194 from fabi1cazenave/l10nUnescape-bug898316

Bug 898316: escape \uXXXX unicode character codes in .properties files, r=Pike
(cherry picked from commit 7d6c6732e38bba5d4eb7883b95b03dd5a65bc789)
Merge pull request #11187 from steveck-chung/Message-youtube-sharing

Bug 896956 - [Youtube] Share video via SMS. r=gnarf37
(cherry picked from commit d85c874f59a3b5172826b146ddcb7d6c75ee4838)
Merge pull request #11178 from steveck-chung/bug-895817

Bug 895817 - [SMS/MMS] Selecting a contact from facebook is not working. r=gnarf37
(cherry picked from commit 0ecd48ef32576aee9df5789fff48bdfef33fffda)
Merge pull request #11197 from AntonioMA/bug-896945_2

Bug 896945 Customize the open-app treatment based on the showApp and showOnly flags r=alive r=fabrice
(cherry picked from commit 217a9482bdba8d51f9c5d0ca65b7e85266769eda)
Merge pull request #11174 from cctuan/896393

Bug 896393 - [Dialer] Keyboard doesnt show in apps when moved from Dialer Contact to other apps.
(cherry picked from commit f3051f93c6b64f4855a6405791905673cf4cc5f2)
Merge pull request #11246 from ian-liu/email/Bug887700_cannot_load_email_in_Inbox_after_OTA_updated

Bug 887700 - [OTA] [Data Migration] [Email] Cannot load email in Inbox after update from v1.0.1 to v1.1.0. r=asuth
(cherry picked from commit 2d9ee5afaaa49d6f2c3db6971b874862fbbbd66c)
Bug 890443 - [SMS] the "fixed header" style and transitions should be adjusted so that it's not jumping when changing header r=schung

Important changes
* changes how the fixed header is found. Now we're iterating starting with the
  top instead of the bottom. In the SMS app, the most common cases is when the
  list is not scrolled so much, and therefore starting at the top will likely be
  way faster once the list is long.
* we don't position the header in the same loop, now we position the header
  depending on the next header, if it exists.
* we use a specific hiding class instead of specifying the 100% transform
  translation in the js code. Also, using a 100% transform translation is used
  instead of display none, so that we can get some necessary measurements in the
  init method. Most notably, we need to take into account the view's padding
  top.

Less important changes:
* changed the desktop mock so that we have more headers when loading in Firefox
* check that we have mozSetMessageHandler before using it so that we can launch
  the app in main Firefox
* moved the first header's margin top to the view's padding top. This makes it
  easier to calculate the exact location to trigger the fixed header switch
  effect.

(cherry picked from commit 5032062fbc83356604a83ed7d6665caccfb36bf2)
Merge pull request #11054 from dominickuo/bug-884720

Bug 884720 - No autoplay for music and video pickers, r=jimporter(cherry picked from commit da606facb28a36de24b884a2c3518d6a76f27e85)