Bug 1014816 - Keep Find My Device working while logged out of FxA.
Bug 1020685: Close only over the URL string that we need. r=bfrancis
Bug 1002581 - Include new strings for enabling geolocation for Find My Device.
Bug 1017203 - Throttle rate of position updates for Find My Device.
Bug 1019139 - Make switch element inline-block.
Bug 1019169: Fixed UTF <-> Uint8Array conversions
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 1007590 - [Cost Control] Make Cost Control to remove balance and top-up SMS responses
Bug 1014955 - [Camera] Migrate v1.3T downsampling patches to v1.4/master
Bug 1021237 - Make the edge zones higher in landscape mode.
Bug 1021533 - (bug 1018836 follow up) css class cleanup.
Bug 973557 -[CostControl][FTU] Update button active while is updating information
Bug 988212 - Support multiple attention screens. r=etienne
Merge pull request #20100 from gitmai/bug-1007590-CC-remove-balance-sms

Bug 1007590 - [Cost Control] Make Cost Control to remove balance and top...
r=salva
Revert "Bug 1017327 - (Part II) Let KeyboardManager use it" for breaking gaia ui tests

This reverts commit 4ebaf831eb6ac05b34447e7d4c6e97adc2be1873.
Revert "Bug 1017327 - (Part I) Implement InputAppsTransitionManager" for breaking gaia ui tests

This reverts commit 3ebe122af79bc73da07b710af0d1fcf3d79601e7.
Revert "Merge pull request #19943 from millermedeiros/1019617-week-view-am-pm"

This reverts commit 25ce8f290d921884e15f7559c0597f6b7efad419, reversing
changes made to d04b7196fb59834704ef38d400c813b7ea68d755.
Merge pull request #20133 from vingtetun/multiple.attention.screen

Bug 988212 - Support multiple attention screens. r=etienne
Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales