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