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 ...
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.
Bug 1066885 - [Camera] Record button flashes blue initially; video does not record, produces error message
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
Merge branch 'v2.0' into v2.0m.
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...
Merge pull request #24204 from davidflanagan/bug1068986

Bug 1068986: convert MediaFrame to use background-image instead of <img> r=justindarc(cherry picked from commit 5baa82f4abae9ce0d10c92a9ecee8fbc4da74e98)

Conflicts:

	shared/js/media/media_frame.js
	tests/python/gaia-ui-tests/gaiatest/apps/gallery/regions/fullscreen_image.py
Merge pull request #24628 from davidflanagan/bug1068986-v2.0

Merge pull request #24204 from davidflanagan/bug1068986
Merge branch 'v2.0' into v2.0m.
Merge pull request #24578 from justindarc/bug1066885-v2.0

Bug 1066885 - [Camera] Record button flashes blue initially; video does ...
Bug 1054570 - Cursor is set to the beginning of the password field after it has been shown as plain text
Bug 1062720 - [STK] Should carry the response in |isYesNo| for "Yes"/"No" request. r=frsela
Bug 1069200 - [Camera]Rapidly click take button and switch picture/video mode will cause video recording and picture mode in the same time