Bug 1026306 - when mobile data isn't connected, wifi hotspot setting silently fails and disables itself. Patch 2.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 1089529 - Lockscreen error after screen off and on when device shows NFC shrinking UI
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 1091483 - Unable to show stk dialog (e.g. user confirmation dialog) when foreground app is Callscreen
Merge pull request #25644 from mancas/bug1026306_v2.0

Bug 1026306 - when mobile data isn't connected, wifi hotspot setting sil...
Merge pull request #25695 from mancas/bug1091504

Bug 1091504 - [B2G][GAIA] STK: AP should not send TR for STK_CMD_REFRESH...
Merge pull request #25990 from snowmantw/bug1089529-2.0

Bug 1089529 - Lockscreen error after screen off and on when device shows...
Bug 1048673 - [Ringtones] stop the previews before leaving the app
Bug 1085201 - [Flame][Tako][v2.1][Settings] "Searching device" not hidden as Sony SBH50 BTHS paired via NFC
Bug 1043762 - Volume buttons don't do anything in Settings and previewing new ringtones
Bug 1083053 - [Midori] The screenshot preview window still overlays an app when switching apps
Bug 1091137 - [ringtones] Fix clearing out the tonePlayer's state when hiding the app

Conflicts:
	apps/ringtones/js/tone_player.js
Merge pull request #26131 from begeeben/1092948_cant_turn_to_landscape

Bug 1092948 - [FFOS2.0][Woodduck][Browser]Can't turn to landscape mode o...
Bug 1032659 - Replace font-weight: lighter with 300
Merge pull request #26135 from michaelwu/bug-1032659-v2.0

Bug 1032659 - Replace font-weight: lighter with 300 (v2.0m)
 Bug 998106 - [B2G][Gaia][FTE][Keyboard] Selecting languages other than
 English during the FTE causes the associated keyboard not to load.
  - Filter out "language to layouts mappings" if the layout is not
    preloaded.
Merge branch 'v2.0' into v2.0m
Bug 1087116 - make alerts scrollable

Conflicts:
	apps/system/js/app_modal_dialog.js
	apps/system/style/modal_dialog/modal_dialog.css