Bug 1092391 - Fix attentionWindow race condition with lockscreen keyboard
Bug 1083528 - Add dev/stage Marketplaces to 2.1
Bug 1097359 - [Window Management]With the software home button option enabled, the button will get pushed out of place and the icons in the notifications bar will overlap when the user selects on the cookies link
Bug 1094129 - [Woodduck v2.0][Flame v2.1][Settings]There is no SIM settings icons when you insert SIM2 only in Settings -> Cellular & Data.
Bug 1082938 - [Music] set play status to playing when play event fires
Bug 1094550 - Unable to create a new account because Year of Birth …
dropdown doesn't work.

 - Create a value selector overlay to listen to the event for showing
   value selector for trusted UI.
 - Let trusted UI module init its own value selector controller.

 r=alive.
Revert "Bug 1099041 - Add the manifest file that sets the default values as a dependency to the others"

This reverts commit e6409eb6d2e8c13127f9e6e46995db03354e4b57.
Merge pull request #26357 from RudyLu/keyboard/Bug1094550_uplift_v2.1

Bug 1094550 - Unable to create a new account because Year of Birth … dropdown
r=alive.
Bug 1095805 - Update modal dialog height on resize event and not visible
Bug 1088224 - Enable resend overwriting test
Merge pull request #26205 from clouserw/1083528.1

Bug 1083528 - Add dev/stage Marketplaces to 2.1  r=fabrice
Merge pull request #26153 from Cwiiis/bug1099055-anchor-link-disables-rocketbar-collapsing

Bug 1099055 - Fix rocketbar collapse being disabled by anchor links. r=etienne
Merge pull request #26088 from gitmai/bug-1098024-navigation-error

Bug 1098024 - [Costcontrol] Navigation error between tabs
r=salva
Merge pull request #26370 from mikehenrty/bug-1088224-enable-alex-test

Bug 1088224 - Enable resend overwriting test
Merge pull request #26268 from dmarcos/bug1097835simple

Bug 1097835 - [Camera] App doesn't listen for 'closed' events
Conflicts:
	apps/camera/js/app.js
Merge branch 'v2.1' of github.com:mozilla-b2g/gaia into v2.1
Merge pull request #26349 from mpizza/Bug_1094129_v2.1

Bug 1094129 - [Woodduck v2.0][Flame v2.1][Settings]There is no SIM settings icons when you insert SIM2 only in Settings -> Cellular & Data. a=bajaj
Merge pull request #26059 from albertopq/1092391-alarm-popup-2.1

Bug 1092391 - Fix attentionWindow race condition with lockscreen keyboard r=alive a=bajaj
Merge pull request #25993 from BorisChiou/bug-1091166

Bug 1091166 - Fix the color contrast value when enabling it
Reland "Bug 1082938 - [Music] set play status to playing when play event fires"

This reverts commit 1b231b87aad384842dfc79614b2a9ca68a4b4ff3.