Bug 1019139 - Make switch element inline-block.
Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info. r=fabrice

Conflicts:

	apps/system/test/unit/ftu_ping_test.js
Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales
Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other applications about sending a SMS for requiring balance or making a SMS top-up
Bug 963394 - Visual refresh for event detail page
Merge pull request #20143 from millermedeiros/1019617-week-view-am-pm

Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales r=gaye
Bug 1021279 - Add a couple more wallpapers to fill the awkward gap in the selection screen r=me
Merge pull request #19889 from eeejay/bug-1019139

Bug 1019139 - Make switch element inline-block. r=kgrandon
Merge pull request #19628 from gitmai/bug-1007588-CC-iac-with-sms

Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other app...
r=salva
Merge pull request #20106 from marshall/bug995434_ftuPingSimLocked_master

Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info
Bug 1021994 - Fix ringtones tests; r=lightsofapollo
Merge pull request #20153 from millermedeiros/event-detail-963394

Bug 963394 - Visual refresh for event detail page r=gaye
Merge pull request #20170 from jimporter/ringtones-fix-tests

Bug 1021994 - Fix ringtones tests
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