Bug 990435 - [tarako] the two homescreens randomly overlapped with each other after wake up from sleep
Bug 988037 - [B2G][Video] WebM videos attached in email do not display properly when previewed in email app
Bug 949941 - [Camera] Replace all memory-backed Blob instances with disk-backed File instances after saving to disk so "pick" activity consumers don't break. r=djf, a=blocking-b2g=1.3T+ on bug 988749 (e-mail bug for tracking purposes)

This is a manual uplift of https://github.com/mozilla-b2g/gaia/pull/17136 from
bug 949941.  It is blocking-b2g=1.3T+ on bug 988749 which is a bug that solely
exists to track the uplift work in the e-mail app.

Initial uplift work was performed by bkelly and that work reviewed/confirmed by asuth.
Merge pull request #17940 from asutherland/camera-file-blob-v1.3t

Bug 949941 - [Camera] Replace all memory-backed Blob instances with disk-backed File instances after saving to disk so "pick" activity consumers don't break. r=djf, a=blocking-b2g=1.3T+ on bug 988749 (e-mail bug for tracking purposes)
Bug 991597 - [v1.3] Fix test_settings_wifi.TestSettingsWifi on v1.3
Merge pull request #17892 from cctuan/990435

Bug 990435 - [tarako] the two homescreens randomly overlapped with each ...
Bug 991644 - [v1.3] test_settings_airplane_mode.TestAirplaneMode also fails on v1.3 with bug 987145
Bug 991679 - [v1.3] Investigate and try to fix test_ftu_skip_tour.TestFtu fails on v1.3
Merge pull request #17931 from russnicoletti/bug988037

Bug 988037 - [B2G][Video] WebM videos attached in email do not display properly when previewed in email app r=johu
Merge branch 'v1.3' into v1.3t
Merge pull request #17457 from punamdahiya/Bug975599

Bug975599 - [Gallery] - Slightly cropping an image from gallery so that more does not attach to MMS
Bug 986358 -[Sora][IOT] Not SIM inserted message appears when SIM is alrady inserted

Conflicts:
	apps/costcontrol/js/widget.js
Merge branch 'v1.3' into v1.3t
Merge pull request #17945 from AndreiH/bug_991597

Bug 991597 - [v1.3] Fix test_settings_wifi.TestSettingsWifi on v1.3
Merge pull request #17947 from AndreiH/bug_991679

Bug 991679 - [v1.3] Investigate and try to fix test_ftu_skip_tour.TestFt...
Merge pull request #17946 from AndreiH/bug_991644

Bug 991644 - [v1.3] test_settings_airplane_mode.TestAirplaneMode also fa...
Bug 991659 - [v1.3] Backport Music tests to v1.3
Merge pull request #17958 from gitmai/bug-986358-rebase-1.3

Bug 986358 -[Sora][IOT] Not SIM inserted message appears when SIM is alr...
Merge pull request #17897 from arcturus/bug-990496

Bug 990496 - [Contacts] Error when user tries to cancel importing contacts

Conflicts:
	apps/communications/contacts/js/utilities/http_rest.js
Bug 990496 - Remove stray '{' that crept in while rebasing. a=bustage