Bug 1021237 - Make the edge zones higher in landscape mode.
Bug 1021533 - (bug 1018836 follow up) css class cleanup.
Bug 1003330: Mobile identity UI. r=ferjm
Bug 990035 - Modify phone-sized tutorial to show vertical-scroll, notifications & sheets video. r=borjasalguero

* modify phone-layout tutorial config to use new video assets and tutorial strings
* placeholder video assets
* add optional callback to _setStep and handle image/video load errors
* hide overflow in tutorial step image/video container
* fix ui test for 3 steps
* remove orphaned tutorial images
* use .step-video-base to ensure video is height:100%
* Post-backout: Refactor tests and clarify expectation in event of config load failure
Merge pull request #19409 from dmarcos/bug995540

Bug 995540 - [Sora][camera]video recording would not stop instantly when...(cherry picked from commit 93623f6435849cc9f54d9996e8e64828ac9091d1)

Conflicts:

	apps/camera/js/app.js
	apps/camera/js/controllers/camera.js
	apps/system/js/attention_screen.js
Bug 1014616 - [Vertical] Align Icon/Divider layout to spec r=me
Merge pull request #20164 from sfoster/bug-990035-video-tutorial

Bug 990035 - Modify phone-sized tutorial to show videsteps. r=borjasalguero
Bug 939174 - Launch whats new FTU tutorial to demo edge gestures etc. r=borjasalguero,alive

* Add shared VersionHelper
* Unit tests for VersionHelper, FTULauncher
* Check device.previous_os in FTULauncher/FTU app
* Launch full ftu when ftu.enabled always
* Launch ftu whats new tutorial when upgrade detected
* Add config for 1.3-2.0 upgrade tutorial
Merge pull request #20175 from davidflanagan/bug995540-master

Merge pull request #19409 from dmarcos/bug995540 r=dmarcos
Merge pull request #20087 from sfoster/bug-939174-upgrade-tutorial

Bug 939174 - Launch whats new FTU tutorial to demo edge gestures etc. r=borjasalguero,alive
Bug 1020435 - One word fix to finalize FTU tutorial strings
Merge pull request #20111 from sfoster/bug-1020435-strings

Bug 1020435 - 'Hold an' not 'Hold on an' icon in new FTU strings. r=fcampo
Bug 1009633 - Pre-polulate browser top sites by SIM
Bug 1019289 - Final FTE videos from epang, with 1x, 1.5x and 2x resolutions. r=fcampo
Merge pull request #19559 from acperez/bug-1009633

Bug 1009633 - Pre-polulate browser top sites by SIM
Merge pull request #20107 from sfoster/bug-1019289-videos

Bug 1019289 - Final FTE videos from epang, with 1x, 1.5x and 2x res. r=fcampo
Merge pull request #20116 from etiennesegonzac/bug-1021237

Bug 1021237 - Make the edge zones higher in landscape mode. r=21
Merge pull request #20120 from etiennesegonzac/bug-1021533

Bug 1021533 - (bug 1018836 follow up) css class cleanup. r=alive
Merge pull request #20011 from borjasalguero/mobileid_ui

Bug 1003330: Mobile identity UI. r=ferjm