Merge pull request #12093 from julienw/912885-use-innerhtml-instead-of-data-url

Bug 912885 - use innerHTML instead of a data-url to inject attachments i...(cherry picked from commit 9659e823b9461c4ea6baf1477501ac9f202a5ad5)

Conflicts:
	apps/sms/js/attachment.js
Bug 912885 - more tests for bug 912885 r=kaze
(cherry picked from commit d4c347b4a4093c86b3b84df2f0af47e4cb19736c)
Bug 929863 - [B2G][Helix][WindowManager][shijinde] Apps appear blank after tapping the notification message on lockscreen
Merge pull request #13645 from luke-chang/929863_hd_click_lockscreen_toast

Bug 929863 - [B2G][Helix][WindowManager][shijinde] Apps appear blank after tapping the notification message on lockscreen, r=alive
Merge branch 'v1-train' into v1.1.0hd
Bug 907951 - [System] replace forward images of wrapper
Bug 907951 - [System] replace forward images of wrapper
Bug 938564 - [Contacts] backout commit dadecdea
 Bug 938564 - [Contacts] backout commit faa8a0c2
Merge pull request #13710 from fabi1cazenave/backout-commit-dadecdea

Bug 938564 - [Contacts] backout commit dadecdea
Merge pull request #13711 from fabi1cazenave/backout-commit-faa8a0c2

Bug 938564 - [Contacts] backout commit faa8a0c2
Bug 914942: uplift to the leo branch
Merge pull request #13653 from huchengtw-moz/gallery/Bug_935072_crop_handle_hard_to_grab

Bug 935072 - [B2G][Gallery] Crop handles are difficult to grab and move, r=djf(cherry picked from commit 8d4f461310c53478a0cdc44ecb8ad10fdb647d66)

Conflicts:
	apps/gallery/style/gallery.css
Merge pull request #13728 from huchengtw-moz/gallery/Bug_935072-v1.1.0hd

Merge pull request #13653 from huchengtw-moz/gallery/Bug_935072_crop_han...
Revert "Merge pull request #13728 from huchengtw-moz/gallery/Bug_935072-v1.1.0hd"

This reverts commit 6e46d4d247f2ee15b79193e2f8368d3976b930d2, reversing
changes made to 77fbd88897006b0a3af6955dd0fb68a4eb476e8e.
Merge pull request #13734 from huchengtw-moz/gallery/Bug_935072-revert

Revert "Merge pull request #13728 from huchengtw-moz/gallery/Bug_935072-...
Merge branch 'v1-train' into v1.1.0hd
Revert "Bug 907951 - [System] replace forward images of wrapper"

This reverts commit 86163ce443e3a5b5093c6143f8646df54b658ec5.
Merge pull request #13738 from huchengtw-moz/camera/Bug_939047_black_border_on_left_side

Bug 939047 - [B2G][Helix][camera][dingyu]The camera preview is not corre..., r=djf(cherry picked from commit 16682523182fa4d047b3ffb63059dd45732078ee)
Merge pull request #13786 from huchengtw-moz/camera/Bug_939047_v1.1.0hd

Merge pull request #13738 from huchengtw-moz/camera/Bug_939047_black_bor...