Bug 1061401 - Fix multiple activity window orientation issue
Bug 1062734 - [Email] Have friendlier PLAIN auth for more SMTP servers
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
Bug 1011584 - Bangladeshi Mobile Network's APN is not available in settings r=jaoo
Bug 1062728 - [email/pop3] POP3 sync breaks on messages that lack a Date header. v2.0-specific uplift. r=mcav

This is a minimal v2.0 specific uplift of the trunk fix for bug 1062728.  It
only includes the date logic to fix the specific error.
Merge pull request #24454 from nullaus/bug1069452

bug 1069452 - Never take screenshot of closing AppWindow if part of home...
(cherry picked from commit 2834baf4c7e34fe6ef335f0469f6d0f593c5922b)

Conflicts:
	apps/system/test/unit/callscreen_window_test.js

Manually resolved, this test does not exist in 2.0 because the callscreen
does not have it's own window type.
Merge pull request #24556 from asutherland/email-v20-pop3-no-date

Bug 1062728 - [email/pop3] POP3 sync breaks on messages that lack a Date header. v2.0-specific uplift. r=mcav
Merge pull request #24583 from nullaus/v2.0

Merge pull request #24454 from nullaus/bug1069452
Merge pull request #24555 from rabbihossain/v2.0

Bug 1011584 - Bangladeshi Mobile Network's APN is not available in settings
Bug 1061417 - [SMS] We don't properly discard the draft in some occasions r=azasypkin
Bug 1071159 - fixing statusbar visibility in fullscreen app with utility tray.
Merge pull request #24591 from yzen/bug-1071159

Bug 1071159 - fixing statusbar visibility in fullscreen app with utility...