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 1002581 - Include new strings for enabling geolocation for Find My Device.
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 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 973827 - Power button modal should be an object menu instead of a custom implementation
Bug 1020167: Add search engine configuration based on MCC/MNC
Bug 973557 -[CostControl][FTU] Update button active while is updating information
Bug 1015875 - OMA CP Settings not processed correctly, settings not active by default.
Merge pull request #19996 from acperez/bug-1020167

Bug 1020167: Add search engine configuration based on MCC/MNC
Merge pull request #19949 from rnowm/power-modal-object

Bug 973827 - Power button modal should be an object menu instead of a custom implementation r=alive