[Bug 867514] Fix location resolving (typo!) [r=crdlc](cherry picked from commit 1c3210498bcd25b612d7f84afc232d648046becb)
Merge pull request #9485 from crdlc/bug-867149

Bug 867149 - landscape or landscape-secondary orientation locked apps re...(cherry picked from commit 1683b36b1e5b488a9b0e95679141a0019a4e37fb)
Merge pull request #9742 from mykmelez/v1-train-867514

[Bug 867514] Fix location resolving (typo!) [r=crdlc]
Revert "Merge pull request #9589 from lodr/bug-828298-avoid-negative-offsets"

This reverts commit 4840d034ff6c677f7f2151cffa068f99b44ab6be.
Bug 847241 - Make switching to an app feel faster r=timdream

- use the event appopen instead of appwillopen to hide the card switcher; this
  makes the card switcher disappear after showing the app, and thus this is
  nicer.
- disable the transition when we want to remove "immediately" the card switcher
- add some unit tests about the card switcher showing or hiding
(cherry picked from commit 53f9e4f70911d3e083d25730490263a60041f37d)

Conflicts:
	apps/system/js/cards_view.js
	apps/system/test/unit/mock_sleep_menu.js
Bug 847241 - Make switching to an app feel faster

Last-minute follow-up: revert the change to the visibility transition, as it
made the display transition invisible.
(cherry picked from commit cb368d63abd8505b7afa9f4c1bb6a5979bb5f537)
Merge pull request #9377 from crdlc/bug-865197 a=npotb

Bug 865197 - Follow-up 861846 - Unit test fixed and added a new one r=julien
(cherry picked from commit 610a684aad80f4d1a4576b5dc1e42dfaba055346)
Merge pull request #9761 from lodr/bug-828298-fixing-mindgap

Bug 828298 - Fixig a problem in the algorithm closing a tag in mindgap.js
r=leo.bugzilla.gaia@gmail.com(cherry picked from commit e29317b6599f4ac51e1d86366287fcc13fd4467d)
Merge pull request #8925 from fabi1cazenave/mmsSettings-bug818380

Bug 818380, Settings/MMS: replace ril.data.mms by ril.mms.mms, r=kaze(cherry picked from commit e5245ac6a56ddf8345698aed044ea8e8cfacd39d)
Merge pull request #9657 from jrburke/bug870317-unicode-escape

Bug 870317: email: fix unicode entity escaping r=asuth(cherry picked from commit 685b2a3df9764cd34bc8dca6d7bf56d40c475294)
Merge pull request #9616 from chuck-lee/bug-869843_remove_WPA_EAP_option_from_Join_hidden_network

Bug 869843 - Remove "WPA-EAP" option from "Security" menu of "Join hidden network". r=arthurcc(cherry picked from commit 5d554abd7c5f6963ed12c2d3f0161ea385b7a79a)
Merge pull request #9712 from alivedise/bugzilla/870894_master/type-sm

Bug 870894 - Fix typo in sound manager, r=timdream(cherry picked from commit 303ea02c1ac3c3eb1192ba950de80f038cb0ef43)
Merge pull request #9710 from alivedise/bugzilla/871374/contentWindow-check-failed

Bug 871374 - contentWindow check for OOP apps, r=timdream, a=blocking-b2g:tef+(cherry picked from commit ba2a59237f8b1ec180f70b9a4f9f833b878c34ab)
Merge pull request #9473 from leob2g/Bug_866559_automatic_selection_finformation_error

Bug 866559 - Automatic selection information doesn't update when connection failed, r=kaze(cherry picked from commit 11f1739ce9d1878d0a2cf31f81cf50251596b763)
Merge pull request #9690 from davidflanagan/bug865177

Bug 865177 - accept all image types in Gallery and honor MediaDB mimeTyp...(cherry picked from commit 3173aaca027a625ceab417f49f8aab2b08ed33a9)
Merge pull request #9643 from ferjm/calllogdbv3

Bug 870359: (Follow-up) Add object store to RecentsDBManager database to...(cherry picked from commit 3479338df4aa24ff99df753d9fb88807c85f2589)
Merge pull request #9688 from benfrancis/830674

Bug 830674 - Allow last tab to be closed. r=daleharvey(cherry picked from commit a6e14e39026c312e53ee36677f7904a88ef9a7eb)
Merge pull request #9190 from pgravel/bug_861397

Bug 861397 - Accept zero-value mnc when doing automatic apn selection, r=kaze(cherry picked from commit 4972566a76efbb64beb4aaf0a4d613cb1fd2d2f7)
Bug 859171 - [Camera][Video] cannot record more than an hour (decoding error), r=djf, a=leo+
(cherry picked from commit e156df2d648c53349dd4e16c514d34b1a454afc8)
Merge pull request #9477 from crdlc/bug-fix-dragdrop-issues

Bug 863877 - [B2G] [Leo] [Homescreen] Icon Apps don't align properly after moving them around(cherry picked from commit e85ec35bc2f06cc84589707ac52ea90675f18247)