Bug 1019139 - Make switch element inline-block.
Bug 1019970 - Clean up connstate l10n
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 1021237 - Make the edge zones higher in landscape mode.
Bug 1021533 - (bug 1018836 follow up) css class cleanup.
Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales
Bug 1019897 - Migrate test_homescreen_move_app.py to new vertical homescreen layout
Bug 1019894 - Migrate test_hs_launch_app.py and test_hs_delete_app.py to vertical homescreen
Bug 1021069 - [Vertical homescreen] Update references to homescreen in test_ftu_*
Bug 1021098 - [vertical homescreen] Update unit tests for vertical homescreen
Bug 1019902 - Disable unmigratable tests test_everythingme_add_collection and test_everythingme_app_install
Bug 1019906 - Xfail test_everythingme_search before migration
Bug 1019905 - Xfail test_everythingme_launch_app before migration
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 1021781 - [Collections] Rename localized values to 'Smart Collections' r=me
Merge pull request #19966 from zbraniecki/1019970-connstate-l10n

Bug 1019970 - Clean up connstate l10n. r=alive
Bug 1003330: Mobile identity UI. r=ferjm
Bug 963394 - Visual refresh for event detail page
Bug 1020755 - (vertical-homescreen) Status bar should become 100% opaque when user scrolls r=alive r=kgrandon
Bug 1021737 - Update test_cleanup_gaia to assert that homescreen scroll to 0 upon touch push