Bug 1095818 v2.1 - [email] app startup by notification goes to message list instead of message reader
Bug 1089529 - Lockscreen error after screen off and on when device shows NFC shrinking UI
Bug 1079692: update video thumbnail title asynchonously so we don't block when the user rotates the phone

fix spelling error in method name
(cherry picked from commit c03c7e97ee867749f94ca523b239c0e5c74ece16)

Merge pull request #25046 from russnicoletti/bug-1079692

Bug 1079692 --  [Flame][Woodduck][Free Test][Video] Make video title truncation code more efficient r=djf(cherry picked from commit 8ff816af5a665b9e1acef49b4163a4fbea48b54a)

update test busted by spelling correction
(cherry picked from commit 6c3e0f2311550da687ad5169521b159e6b94f37e)
Bug 1079519 - Unable to play video clips during WEBRTC video call

Do not hide the back button under the in use overlay. Handle the case where we try to resume a video while a WebRTC call is in progress

do not hide the pick activity back button under the in-use-error overlay

use a timeupdate event instead of playing event

address review comments
Bug 1095805 - [System][SHB] Enable software home styles for crash dialog r=mhenretty
Bug 1092143 - [Costcontrol] Widget in utility tray has some visual defects when the balance is lower than balance alert limit
Bug 1093797 - Clear cached picture size when releasing camera.
Merge pull request #25965 from jrburke/bug1095818-v2.1-email-app-startup-notification-order

Bug 1095818 v2.1 - [email] app startup by notification goes to message list instead of message reader r=asuth a=fabrice
Merge pull request #25982 from snowmantw/bug1089529-2.1

Bug 1089529 - Lockscreen error after screen off and on when device shows...
Bug 1088279 - Intermittent test_a11y_phone_keypad.py disable on tbpl/macos r=me a=test-only
Bug 1029763 - The contact thumbnail scaling is terrible, all jagged

Conflicts:
	apps/sharedtest/test/unit/image_utils_test.js
Bug 1095714 - [SearchWindow] Remove SettingsListener on destroy r=alive
Bug 1098279 - Add -dsds to existing Jenkins jobs
Merge pull request #26121 from JohanLorenzo/bug-1098279-v2.1

Bug 1098279 - Add -dsds to existing Jenkins jobs
Bug 1090281 - Investigate failure in test_setup_and_send_imap_email.py
Merge pull request #26145 from bebef1987/fix_email

Bug 1090281 - Investigate failure in test_setup_and_send_imap_email.py
Bug 1099041 - Add the manifest file that sets the default values as a dependency to the others
 Bug 998106 - [B2G][Gaia][FTE][Keyboard] Selecting languages other than
 English during the FTE causes the associated keyboard not to load.
  - Filter out "language to layouts mappings" if the layout is not
    preloaded.
Bug 1091067 - Making sure the edge zones aren't covering the app chrome in landscape.
Bug 1095369 - [FFOS2.0][Woodduck][Browser]Wallpaper will display when edit bookmark

When changing orientation from portrait to landscape and resizing with keyboard on, the layout manager in the system app will resize the height of the active app first with the keyboard height in portrait (line 55 in layout_manager.js). When the height of the keyboard in portrait mode is bigger than the height in landscape mode, the calculated height of the active app will be smaller than it should've been. The system wallpaper is visible at the mean time. Subsequent resize events later will immediately correct the active app height using the correct landscape keyboard height.

The resizing event sequence is 'resize' --> 'keyboardchange' --> 'keyboardchange'. This patch disables the keyboard height check in the 'resize' event since it'd be incorrect during orientation change, which would display part of the system wallpaper in a flash.