Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Bug 1090408 - apps/communications/contacts/test/marionette/contacts_shortcuts_test.js permared on v2.0 r=jmcf
Bug 1050861 - Use version 2.4.1 for tornado in gaia unit tests
Bug 956902 - [B2G][First Time Experience] User is able to access and become stuck in Settings app during FTU/FTE
Merge pull request #25519 from luke-chang/1079129_v2.0_fullscreen_prompt_overlay_lockscreen

Bug 1079129 - [Woodduck] Lock screen is hidden by full screen prompt message
Bug 1088575 - [LockScreen][EmergencyCall]After click 'More info' in app permission, enter emergency call will get all functionalities broken

Conflicts:
	apps/system/test/unit/lockscreen_test.js
Merge branch 'v2.0' into v2.0m
Merge pull request #25643 from mancas/bug956902

Bug 956902 - [B2G][First Time Experience] User is able to access and bec...
Revert "Merge pull request #25643 from mancas/bug956902"

This reverts commit 5f3126b10569f4f252b2babfba5442b66605740b, reversing
changes made to cebd567d0de3755e2bddbc07a7721a7c67ca6eb6.
Merge branch 'v2.0' into v2.0m
Bug 1067625 - Increasing timeout for performance tests to account for longer profile creation a=npotb r=lightsofapollo
Bug 1083775 - [System] status-bar label is overlapped with icons if the operator text is long in 2.0
bug 1091775 - adding new png files for status bar
Bug 1092112 - [Messages] Waiting screen never disappears if user confirms thread deletion when there is not any selected thread. r=schung
Bug 1053641 - Remove newlines from localized strings describing call forwarding status r=drs

(cherry picked from commit c451052868e71c932311dae95d99857c5b368f49)

Conflicts:
	apps/communications/dialer/locales/dialer.en-US.properties
	apps/communications/dialer/test/unit/mmi_test.js
Merge pull request #25897 from gabrielesvelto/bug-1053641-v2.0-uplift

Bug 1053641 - Remove newlines from localized strings describing call forwarding status r=drs
Merge branch 'v2.0' into v2.0m
Bug 1085212: release video hardware before sharing and restore when done.
Merge pull request #25773 from gmarty/Bug-1083775-status-bar-label-is-overlapped-with-icons-if-the-operator-text-is-long-in2.0-fix

Bug 1083775 - [System] status-bar label is overlapped with icons if the ...
Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface always when clickX

Conflicts:
	shared/js/contacts/import/facebook/fb_utils.js