Bug 1026306 - when mobile data isn't connected, wifi hotspot setting silently fails and disables itself. Patch 2.0
Bug 1090408 - apps/communications/contacts/test/marionette/contacts_shortcuts_test.js permared on v2.0 r=jmcf
Bug 1074051 - [Settings] sound volume is not changed. Patch v2.0
Bug 1092948 - [FFOS2.0][Woodduck][Browser]Can't turn to landscape mode on editing bookmark screen when add bookmark to Home screen

* Remove incorrect orientation setting in manifest.webapp
Bug 1091504 - [B2G][GAIA] STK: AP should not send TR for STK_CMD_REFRESH. r=timdream
Bug 1083775 - [System] status-bar label is overlapped with icons if the operator text is long in 2.0
Bug 1085212: release video hardware before sharing and restore when done.
Bug 1089529 - Lockscreen error after screen off and on when device shows NFC shrinking UI
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 998147 - Uplift for 2.0.  Modify callEnded to tell if call was rejected and not send notification
Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface always when clickX

Conflicts:
	shared/js/contacts/import/facebook/fb_utils.js
Merge pull request #25947 from davidflanagan/bug1085212-v2.0

Bug 1085212: release video hardware before sharing and restore when done
Revert "Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface always when clickX"

This reverts commit 71bb3c6a743d15d191b05e2d11f1eba759de7e53.
Bug 1092962 - [FFOS2.0][Woodduck][Voicemail]There is any prompt message when dial the voicemail number by long press the "1" key.
Bug 1095369 - [FFOS2.0][Woodduck][Browser]Wallpaper will display when edit bookmark

When changing orientation from portrait to landscape and resizing with keyboard on, the layout manager in the system app will resize the height of the active app first with the keyboard height in portrait (line 55 in layout_manager.js). When the height of the keyboard in portrait mode is bigger than the height in landscape mode, the calculated height of the active app will be smaller than it should've been. The system wallpaper is visible at the mean time. Subsequent resize events later will immediately correct the active app height using the correct landscape keyboard height.

The resizing event sequence is 'resize' --> 'keyboardchange' --> 'keyboardchange'. This patch disables the keyboard height check in the 'resize' event since it'd be incorrect during orientation change, which would display part of the system wallpaper in a flash.
Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface when user clicks 'x' on the window
Merge pull request #26026 from jmcanterafonseca/logout_facebook_20

Bug 1084224 - [Midori 2.0][Contacts][Facebook]keep logging out interface...
Merge pull request #25586 from arcturus/bug-1090408

Bug 1090408 - apps/communications/contacts/test/marionette/contacts_shortcuts_test.js permared on v2.0 r=jmcf
Merge branch 'v2.0' into v2.0m
Merge pull request #26017 from mpizza/Bug_1092962_v2.0m

Bug 1092962 - [FFOS2.0][Woodduck][Voicemail]There is any prompt message ... r=drs.