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 1019220 - Settings Icons need improvements
Bug 1017203 - Throttle rate of position updates for Find My Device.
Bug 1016233 - [Collections App] Collection UI styling
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 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 1018335 - removeFocus() when the screen is locked
Bug 1020628 - Don't allow user to start activity twice in keyboard settings
Bug 973557 -[CostControl][FTU] Update button active while is updating information
Bug 1015875 - OMA CP Settings not processed correctly, settings not active by default.
Bug 1021137 - added missing aria attributes the the lockscreen's passcode panel and media container. r=alive
Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales
Merge pull request #19780 from guilherme-pg/bug1014816-fmd-fxa-logout

Bug 1014816 - Keep Find My Device working while logged out of Firefox Accounts.
Merge pull request #19951 from guilherme-pg/bug1017203-position-throttle

Bug 1017203 - Throttle rate of position updates for Find My Device.