Bug 1021051 - Merge all after app-makefile js target into a single one. r=yurenju
Bug 1022633 - Fix branding path in DEBUG=1 mode. r=yurenju
Bug 1014816 - Keep Find My Device working while logged out of FxA.
Bug 1020091 - ensuring that the search entry has a correct DOM order within the e.me app.
Bug 1020109 - Cell broadcast search list is not set correctly

The current code attempts to protect against empty objects incorrectly
since empty arrays are truthy in JavaScript. The result is empty objects
get passed to SettingsLock.set() which seems to break all subsequent
settings change observers.
Bug 1018340 - Make gaia-header edit mode exclusively visible.
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 1017441 - [Gaia][Contacts] Contact screen scroll beyond 'A ~ Z-#' shows blank preview screen.
Bug 1019139 - Make switch element inline-block.
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.