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 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 1011000 - Enable audio channel change Gaia UI Tests checking
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
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
Bug 1086571 - Investigate and fix test_call_log_all_calls intermittent failuresI hate this test
Bug 1088623 - Adding lockscreen libary to 2.1
Merge pull request #25570 from chirarobert/uplift_calls

Bug 1086571 - Investigate and fix test_call_log_all_calls intermittent f...
Bug 1075699 - Suppress ModifiedDialError to user from gecko for STK voicemail redirect. r=drs
Merge pull request #25560 from crh0716/1079356_v2.1

Bug 1079356 - Use "types" instead of "type" when creating APN items r=gsvelto
Merge pull request #25482 from cctuan/1079567-v21

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 1080912 - [Camera]The camera button and video button will fail to function when the user opens and closes the camera app multiple times via the home button
Merge pull request #25558 from mikehenrty/bug-1088686-remove-quick-settings-data

Bug 1088686 - Remove quick settings code since it is not present in 2.1
Merge pull request #25552 from tamarahills/bugfix/1075699_2_1_uplift

Bug 1075699 - Suppress ModifiedDialError to user for TMobile Voicemail
Merge pull request #25493 from albertopq/1088623-add-lib-lockscreen-2.1

Bug 1088623 - Adding lockscreen libary to 2.1 a=testonly
Merge pull request #25479 from snowmantw/bug1084530-2.1

 Bug 1084530 - [Lockscreen] The device can fall asleep too quickly after...