Bug 1086175 - [Flame][KK]After full flash/reset phone, first time to
pair bluetooth with another phone will show notification then pair
failed
Bug 1086285 - update licensing information for v2.1.
Bug 1082864 - TypeError: evt is null at: app://system.gaiamobile.org/js/modal_dialog.js line: 250
 Bug 1084530 - [Lockscreen] The device can fall asleep too quickly after dialing the last digit to an emergency number
Bug 1079567 - [NFC][Shrinking UI] App is rendered as a black screen if the recipient device is pulled away before the user finishes the transfer gesture.
Bug 1088685 - Update node modules
Bug 1088678 - Fix 2.1 integration tests cbs
Merge pull request #25357 from cctuan/1082864

Bug 1082864 - TypeError: evt is null at: app://system.gaiamobile.org/js/modal_dialog.js line: 250
Bug 1083717 - Notifications text in utility tray slightly truncated in some locales
Bug 1011000 - Enable audio channel change Gaia UI Tests checking
Bug 1087788 - Status bar icons still overlapping with URL bar when geolocation icon is involved
Merge pull request #25266 from gmarty/Bug-1083717-Notifications-text-in-utility-tray-slightly-truncated-in-some-locales

Bug 1083717 - Notifications text in utility tray slightly truncated in some locales
Merge pull request #25531 from albertopq/1088678-fix-test-2.1

Bug 1088678 - Fix 2.1 integration tests cbs a=testonly r=kgrandon
Bug 1088632 - [Integration] Disable test - Homescreen tests are failing in v2.1 r=kgrandon a=npotb
Bug 1088632 - Follow-up, fix json typo r=kgrandon a=nbotb
Bug 1088686 - Remove quick settings code since it is not present in 2.1
Bug 1079356 - Use "types" instead of "type" when creating APN items

Conflicts:
	apps/wappush/js/cp_screen_helper.js
Merge pull request #25523 from evanxd/bug-1088685

Bug 1088685 - Update node modules r=mcav
Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Merge pull request #25541 from chirarobert/uplift_audio

Bug 1011000 - Enable audio channel change Gaia UI Tests checking