Bug 1014816 - Keep Find My Device working while logged out of FxA.
Bug 959195 - Show user prompt on low battery before applying update
Bug 1020685: Close only over the URL string that we need. r=bfrancis
Bug 1016541 - Thread and Composer. The input placeholder text (Message) should be italic
Bug 1002581 - Include new strings for enabling geolocation for Find My Device.
Bug 1017203 - Throttle rate of position updates for Find My Device.
Bug 1020155 - Populate collection datastore with data defined in pre_installed_collections.json
Bug 1019139 - Make switch element inline-block.
Bug 1019169: Fixed UTF <-> Uint8Array conversions
Bug 1000852 - Clean up bootstrap mozL10n API use in Video
Bug 1021027 - [Flame] Investigate failure in gallery tests
Bug 1019970 - Clean up connstate l10n
Bug 1021034 - [flame] Investigate failure in test_camera_flash_modes.py
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 1016334 - Do not change url of homescreen if there is front window
Bug 1021479 - [VsD Refresh] Lockscreen Visual Refresh: Slider arrow size
Bug 1017327 - (Part I) Implement InputAppsTransitionManager
Bug 1017327 - (Part II) Let KeyboardManager use it