Bug 1069157 - [PDF Viewer] update pdfj.js in Gaia for v2.1
Bug 1076605 - app is killed between launch and open
Bug 1099006 - [Flame][Lock Screen]The keybord of PIN input page will be displayed on lockscreen after restart device.
Bug 1106033 - [v2.1] Fix test_ftu_skip_tour failure
Merge pull request #26554 from chirarobert/bug_1106033

Bug 1106033 - [v2.1] Fix test_ftu_skip_tour failure
Bug 1091679 - Update tests to wait for the plivo call to end
Merge pull request #26590 from viorelaioia/wait_for_call_end

Bug 1091679 - Update tests to wait for the plivo call to end
Bug 1076216 - Attention indicator polish
Merge pull request #26216 from alivedise/bugzilla/1076605/revive-browser-when-necessary

Bug 1076605 - app is killed between launch and open
Bug 1101158 - Use shared tagged template library for escaping card content r=aus r=freddyb

Conflicts:
	apps/system/js/card.js
	apps/system/test/unit/task_manager_test.js
Merge pull request #26599 from KevinGrandon/bug_1101158_uplift_v2_dot_1

Bug 1101158 - Use shared tagged template library for escaping card content
Bug 834530 - Make the TonePlayer handle the channel sounds will be played on r=drs

(cherry picked from commit 20a56c3cf6ea6b730d05d7a8cfa06e178cd5717c)

Conflicts:
	apps/callscreen/js/index.js
	apps/communications/dialer/js/dialer.js
	apps/communications/dialer/test/unit/tone_player_test.js
	apps/emergency-call/js/dialer.js
	apps/emergency-call/js/keypad.js
	apps/emergency-call/test/unit/keypad_test.js
	apps/sharedtest/test/unit/dialer/telephony_messages_test.js
	build/jshint/xfail.list
	shared/js/dialer/keypad.js
	shared/js/dialer/telephony_messages.js
	shared/js/dialer/tone_player.js
	shared/test/unit/mocks/dialer/mock_calls_handler.js
Bug 1092362 - Use the default audio channel when playing audible tones outside of calls r=drs,francisco

(cherry picked from commit e327daf01fac1e5fbe2ba732c26e3a21db32443a)
Merge pull request #25900 from gabrielesvelto/bug-834530-v2.1-uplift

Bug 834530 - Make the TonePlayer handle the channel sounds will be played on r=drs
Merge pull request #26223 from gitmai/bug-1069157-pdfviewer-update

Bug 1069157 - [PDF Viewer] update pdfj.js in Gaia for v2.1
Bug 1095471 - Dismiss keyboard between input entry to avoid macos intermittents
Merge pull request #26598 from nullaus/bug1100714

Bug1100714
(cherry picked from commit 81580722b6f7e576a11e7973c0899cd55bd2f24c)

Conflicts:
	apps/system/test/unit/app_chrome_test.js
Merge pull request #26640 from nullaus/v2.1

Merge pull request #26598 from nullaus/bug1100714
Fix linter issues. r=me
Merge pull request #26643 from nullaus/v2.1

Fix linter issues. r=me