Merge pull request #15744 from mikehenrty/bug-959800-mozbrowser

Bug 959800 - [Offline] mozbrowser iframes don't display correct offline ...
(cherry picked from commit f1928155eb29b6b1766ba6ca8380221a4f670d60)

Conflicts:
	apps/system/js/net_error.js
	build/jshint/xfail.list
Merge pull request #15875 from etiennesegonzac/bug-964981-contact-details-background

Bug 964981 - Making sure the contact details view-body has a background r=arcturus
(cherry picked from commit 4470879d2fec6c6344e72e7390632923eba224d6)

Conflicts:
	apps/communications/contacts/style/contacts.css
fixing jslint errors
Merge pull request #15900 from mikehenrty/bug-959800-uplift

Merge pull request #15744 from mikehenrty/bug-959800-mozbrowser, r=auswer
Bug 957709 - Patch to prevent Camera/Gallery switch buttons from being hammered.

Update patch for 957709 after djf's review.

Updated PR 15845 following review.

Clean up.

Fixed typo in comments.

Added comment for clarity in camera.js.

linted.
Bug 961986 - [fugu][buri] it took long time to resume music play after ending a phone call

When a call starts, oncall.html opens and the KeypadManager set the priority
of the TonePlayer's audio channel "telephony" so that users can hear tones
when they tap the keypad during a call. We need to reset the channel to
"normal" when hanging up (and thus closing oncall.html) so that other apps can
resume playing audio. Otherwise, we end up waiting for the cycle collector to
kill the audio context, which can take a long time.
Merge pull request #15845 from justindarc/v1.3

Bug 957709 - Patch to prevent Camera/Gallery switch buttons from being hammered
Merge pull request #15952 from jimporter/dialer-audio-channel

Bug 961986 - [fugu][buri] it took long time to resume music play after ending a phone call r=etienne
bug 968102

* fix js load order so that OperatorVariantHandler is defined and available as expected.

r=janjongboom
Merge pull request #15971 from nullaus/bug968102

bug 968102
Bug 967878 - [Messages] Background doesn't scroll with the threads causing expensive over-invalidation. r=felash,bgirard
Merge pull request #15998 from vingtetun/bug967274

Bug 967274 - [Contacts] Background doesn't scroll with the contacts caus...
Bug 967880 - [Call Log] Background doesn't scroll with the logs causing expensive over-invalidation. r=etienne,bgirard
Merge pull request #15997 from vingtetun/bug967277

Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. r=arct...
Bug 966463 - [B2G][Homescreen] Cancelling an app download from Homescreen will result in a grey icon that has no function after a restart

(cherry picked from commit d37ed431d91818ad5f3f91cf8af938c951bef038)
Merge pull request #14322 from KevinGrandon/bug_945777_enable_position_sticky_pref

Bug 945777 - Enable position:sticky in gaia
(cherry picked from commit 4bfe2353566ed2164a97d900649e60f434b0854a)
Merge pull request #15889 from timdream/lockscreen-transitionz

Bug 966711 - Use translateZ() for lockscreen fade-out transition, r=snowmantw
(cherry picked from commit 75e9691f02b9d18585c18a5434beeff39ee7ea20)
Bug 967094 - Expose some prefs related to Tiling. r=kgrandon

(cherry picked from commit 95cc9f7ecb3cd203befd3e942ec266ca1ba6464d)
Merge pull request #15442 from steveck-chung/bug-948958

Bug 948958 - [Messages][MMS] MMS does not display correctly when it has a subject but no content
(cherry picked from commit 014e6c39c69fdc51c08079c9bb3b827664387dcd)
Merge pull request #15879 from arcturus/bug-966445

Bug 966445 - [Contacts] When viewing contact details as an activity (from Messages for example or Rocketbar), launching email activity doesn't work r=bkelly
(cherry picked from commit 43a715293eba2d8b163e228dbb9a109a4dbc19e4)