Bug 1061401 - Fix multiple activity window orientation issue
Bug 1052447 - [Messages] when we're in an activity and we delete all messages in the thread, we should close the activity r=azasypkin

Conflicts:
	apps/sms/js/thread_ui.js
Bug 1062734 - [Email] Have friendlier PLAIN auth for more SMTP servers
Merge pull request #24337 from julienw/1052447-v2.0-fix-exit-activity-on-delete

Bug 1052447 - [Messages] when we're in an activity and we delete all mes...
Bug 1058900 - [email] Workaround graphics corruption / memory spikes by cleaning up HTML display logic. r=jrburke
Bug 1071672 - Disable failing test, bookmark_uninstall_test.js r=kgrandon a=testonly
Bug 1066015 - [Camera] black screen when press power key as soon as you open a camera app
Bug 1068356 - Authentication screen remains indefinitely when long tapping on the homescreen button in the FxAccount login proccess. r=alive

Conflicts:
	apps/system/js/fxa_ui.js
	apps/system/js/mobileid_dialog.js
Merge pull request #24333 from shamenchens/Bug1061401-MultipleActivityWindow-v20

Bug 1061401 - Fix multiple activity window orientation issue, r=alive
Merge pull request #24346 from asutherland/email-20-smtp-plain-auth-fix

Bug 1062734 - [Email] Have friendlier PLAIN auth for more SMTP servers. a=bajaj
Merge pull request #22254 from RudyLu/keyboard/Bug1031561-no_auto_capitalize_acronym

Bug 1031561 - don't auto-capitalize when there are 2 uppercase letters in
r=djf
(cherry picked from commit 80a452a2615446839482ee98a0744285d723f531)

Conflicts:
	apps/keyboard/js/imes/latin/latin.js
Merge pull request #24469 from RudyLu/keyboard/Bug1031561-v2.0

Merge pull request #22254 from
Merge pull request #24405 from justindarc/bug1066015-v2.0

Bug 1066015 - [Camera] black screen when press power key as soon as you ...
bug 1062136 - Event driven screenshot overlay. r=alive,etienne

Merge pull request #24149 from nullaus/v2.1

Merge pull request #23874 from nullaus/bug1044125 a=fabrice
(cherry picked from commit f1d3cd2301b604b7b8b8dcf69bd36ba638c1ab44)
Merge pull request #24404 from nullaus/bug1062136-v2.0

Merge pull request #24149 from nullaus/v2.1
Merge pull request #24404 from nullaus/bug1062136-v2.0

Merge pull request #24149 from nullaus/v2.1
(cherry picked from commit 5c2303ec4e367da060aa1b807d541a6549b3d72a)

Conflicts:
	apps/system/test/unit/action_menu_test.js
Merge pull request #24492 from nullaus/bug1062136-v2.0m

Merge pull request #24404 from nullaus/bug1062136-v2.0
Merge branch 'v2.0' into v2.0m.
Bug 1070791 - [camera] Face Detection box is not disappear without face after taking a picture. r=justindarc
Merge pull request #24549 from msliu/bug-1070791-fix-2.0m

Bug 1070791 - [camera] Face Detection box is not disappear without face ...