Bug 1089529 - Lockscreen error after screen off and on when device shows NFC shrinking UI
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 1093951 - Entering wifi power save mode when screen off. r=alive

While screen is off, wifi would go to power save mode only
when wifi lock is held. If wifi lock is not held, wifi would
stay on and be turned off after |wifi.screen_off_timeout|.
We can more aggressively request the wifi driver to enter
power save mode before timed out. This is what the patch
intends to do.