Bug 1017203 - Throttle rate of position updates for Find My Device.
Bug 1016233 - [Collections App] Collection UI styling
Bug 1017441 - [Gaia][Contacts] Contact screen scroll beyond 'A ~ Z-#' shows blank preview screen.
Bug 1019139 - Make switch element inline-block.
Bug 991949 - Cell broadcast ETWS messages show undefined

ETWS messages without a message body use a canned body depending on the
warning type.

Change-Id: I25491fd85894d334bd6a9ab63105379de495ef2a
Bug 1019169: Fixed UTF <-> Uint8Array conversions
bug 982295 - Use new Browser API download method. r=benfrancis
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 977528 - [Contacts][Feature] Importers should give information of automated merged contacts
Bug 1021533 - (bug 1018836 follow up) css class cleanup.
Bug 1018335 - removeFocus() when the screen is locked
Bug 973827 - Power button modal should be an object menu instead of a custom implementation
Bug 1020628 - Don't allow user to start activity twice in keyboard settings
Bug 1020167: Add search engine configuration based on MCC/MNC
Bug 1021578 - use "$(SEP)" instead of "/" for app-makefile-template
Bug 973557 -[CostControl][FTU] Update button active while is updating information