Bug 1043884 - Fix contacts scrollbar overlay shows empty content when click it
Bug 1068540 - [camera] Recording stopped by power key is saved, but not reflected in Camera/Video/Gallery apps
Bug 1075353 - 1st inline activity is not killed before the second inline activity comes.
Merge pull request #24904 from justindarc/bug1068540-v2.0

Bug 1068540 - [camera] Recording stopped by power key is saved, but not reflected in Camera/Video/Gallery apps
Bug 1086644 - Changing performance tests back to use legacy screen unlocking
Bug 1070865 - Fix incorrect resize within popup window
Bug 1073484 - [GAIA][Contacts]Edit two times in contact search result in improper contact data
Bug 1065731 - When adding a number to an existing contact, search icon does nothing

Conflicts:
	shared/pages/import/style/search.css
Bug 1082456 - The buttons of the fullscreen permission dialog become "Don't share / Share" abnormally after the geolocation permission dialog is shown previously
Bug 1072366 - [Lockscreen] Locking while the unlocking animation performs lead to black screen
Merge pull request #24994 from julienw/1076703-v2.0-fix-dsds-switch

Bug 1076703 - In DSDS mode, switching SIM does not work in the new messa...
Bug 1072458 - Certain characters cannot be input using Bangla keyboard

(cherry picked from commit 707c14abb8dc8046c9dcbeef25b59a331635c34f)

Conflicts:
	apps/keyboard/js/layouts/bn-Avro.js
a=bajaj.
Merge pull request #25378 from eliperelman/bug-1086644-v2.0

Bug 1086644 - Changing performance tests back to use legacy screen unlocking
Merge pull request #25132 from RudyLu/ime/Bug1077609_uplift_v2.1

Bug 1077609 - uplift to v2.1.
(cherry picked from commit f37fac7ad3e05f8c5fb964c738848b86a62bce05)
a=v2.0, bajaj.
Bug 1081243 - [Downloads] A recently download file can not be open. Patch v2.0
Bug 1004985 - Close screenshot notification when user responds to it. r=timdream
Bug 1032068 - Maintain id pool of activity chaining instances to keep only one chaining
Merge pull request #25313 from cctuan/1075353-v20

Bug 1075353 - 1st inline activity is not killed before the second inline activity comes.
Bug 1085380 - First activity is not killed after the second one started
Merge pull request #25489 from mancas/bug1081243_v2.0

Bug 1081243 - [Downloads] A recently download file can not be open. Patc...