Bug 859035 - [l10n] Do not use the same unknown entity for Size & Author when installing a WebApp
Bug 855117 - Move the description to a separate li
Bug 902409 - Added a missing dependency to the webapp-zip target
Bug 901383 - Some permissions dialogs should have a 'more info' capability. r=etienne

(cherry picked from commit 0b1404818d1d1069ff79320c5fce7708be0b2f20)
Bug 898341 - The flashlight icon is still here after switching to front-facing camera
Merge pull request #11436 from mpizza/bug_898341_hd

Bug 898341 - The flashlight icon is still here when switching to front camera. r=daleharvey
Bug 894203 - [music] Update the @1.5x assets
Merge pull request #11366 from dominickuo/v1.1.0hd-bug-894203

Bug 894203 - [music] Update the @1.5x assets for hd branch, r=rexboy7
902973 - [SMS][MMS] Intermittent TEST-UNEXPECTED-FAIL in notification_test.js r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=902973

- Clean up
- Migrate to sinon.spy
- Use mocks as spy targets
- Assert on spy intel instead of mock properties
- Simpify mocks
- Ensure Threads tests start with hash = '';
- Remove from blacklist

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 2becb16639589225f5948ebfd1c704cc36cdba0a)

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
[Bug 902786] Merge fix for e.me landing page integration (bug 838634)
Bug 838634 - Better integration of e.me to the landing page. r=pike, a=leo+
Merge pull request #11440 from EverythingMe/902786

[Bug 902786] Merge fix for e.me landing page integration, r=timdream
Merge branch 'v1-train' into v1.1.0hd
Merge pull request #11400 from gabrielesvelto/bug-902409-parallel-builds-v1-train

Bug 902409 - Added a missing dependency to the webapp-zip target r=ochameau
Merge branch 'v1-train' into v1.1.0hd
Bug 896425 - Add customization support for recording profile
Merge pull request #11453 from yurenju/896425-hd

896425 hd r=djf
Bug 901041 - Remove 'swipe left' screen in tutorial (as part of the first run experience)

Conflicts:
	apps/communications/ftu/css/images/tutorial/2@1.5x.png
	apps/communications/ftu/css/images/tutorial/2@2x.png
	apps/communications/ftu/css/images/tutorial/3@1.5x.png
	apps/communications/ftu/css/images/tutorial/3@2x.png
	apps/communications/ftu/css/images/tutorial/4@1.5x.png
	apps/communications/ftu/css/images/tutorial/4@2x.png
[Bug 903043] Fix and enhance e.me integration on the landing page
Bug 902465 - Too many CanvasLayer on e.me results hurts panning. part 1. r=vingtetun