Bug 952592 - Collect sizemode from first window in BrowserUITelemetry. r=Gijs, a=lsblakk.
Bug 953246 - #include NullPtr.h in gdk-screenshot.cpp, NPOTDB, a=lsblakk
Bug 946233 - Revert to single quickshare behaviour (r=wesj, a=lsblakk)
Bumping gaia.json for 2 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/4b6a57482685
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #15069 from viorelaioia/bug_957118

Bug 957118 - [v1.3] Unxfail tests on v1.3

========

https://hg.mozilla.org/integration/gaia-1_3/rev/08b485234431
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 957118 - [v1.3] Unxfail tests on v1.3
Bug 937132 - SpiderMonkey: Check for overflows in LifoAlloc. r=luke, a=bajaj

--HG--
extra : rebase_source : 414ac974217d016d594989295b8d2661fbcdf729
Bug 884226 - Add 'willReadFrequently' getContext() option for 2D canvas. r=ehsan, r=gwright, a=koi+

--HG--
extra : rebase_source : 0fc8825d9fc43d508f530c7938136085da87ef4d
Bug 947928 - [RTSP] System crash when opening RTSP for the second time (NAT problem). r=sworkman, r=vchang, a=1.3+

--HG--
extra : rebase_source : 3d8bad895d7bdd009e82ecb7dadaf8dbc3a48b22
Bug 951117 - [RTSP][Video][V1.3] Crash happened while stop playing RTSP strreaming. r=sworkman, a=1.3+

--HG--
extra : rebase_source : 348a35d7cb365f7ab94a199c61852b97eb0d56be
Bug 956833 - Clear manifests cache on memory pressure. r=gal, a=1.3+

--HG--
extra : rebase_source : 7cd1da7fc268279a3ec39efd546ca76ecad4a91f
Bug 952170 - Remove unnecessary static_cast. r=smaug, a=1.3+

--HG--
extra : rebase_source : 1e5465bb6222be7f9bdd9a305d031bbf02f2bb16
Bug 952170 - Add an explicit copy constructor for WidgetTouchEvent so the touches get copied properly. r=smaug, a=1.3+

--HG--
extra : rebase_source : db739c416b6b10ef4c47141b2f28f79e4c52dfc1
Bug 941457 - When clearing history, close all open tabs so the browser (including overlay buttons) is in a consistent state. r=mbrubeck, a=lsblakk
Bug 938107 - Wait for media state machine thread to shutdown during XPCOM shutdown before returning. r=roc, a=lsblakk

Add a MediaShutdownManager and have that as the only xpcom-shutdown
observer. This then shutsdown the MediaDecoders, and blocks waiting for
the media state machine's shared thread to complete shutdown before
exiting from the xpcom-shutdown observer. This ensures that the
MediaDecoder infrastructure does not use XPCOM on any thread after XPCOM
has shutdown, which is a logical error.
Bug 850372 - Delete session store backup during process suspend so that termination-from-suspended-state is treated as a normal shutdown. r=mbrubeck, a=lsblakk
Bug 947778 - Return early from SetEventHandler when ELM can't find the global jsobject. r=bz, a=lsblakk
Bumping gaia.json for 2 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/2682aa435cf7
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #15052 from cvan/mkt-icons

Bug 944224 - Forgo data URIs for Marketplace homescreen icons, r=fabrice
(cherry picked from commit 43382bab150125ba0817f4c18e5d76d6d028e8a5)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/fe4437ad5161
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #14648 from lissyx/bug910999

Bug 910999 - Correct display and removal of voicemail notification r=alive,julienw
(cherry picked from commit 024357ef445fc52f84283897203386430ba4dc0d)
Bug 933109: Add tests to verify that we retry OCSP when we have a cached Unknown response, r=keeler, a=test-only

--HG--
extra : rebase_source : ae77bdda310823c1b2a54809886d3626f7b44a17
extra : source : d59351efd4139f64a16549243de37767bb5276a9
Bug 952876: Add test for bug 952808 (OCSP stapling not honored when there is a error entry in the OCSP cache), r=keeler, a=test-only

--HG--
extra : rebase_source : 1d9eaf50c29955655cb2d0166d86ac13909ab04f
extra : source : 1a3822490bb03e22b69643b8d32cc5cfc69c79ff
Bumping gaia.json for 47 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/8bbac295eaae
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14892 from etiennesegonzac/bug-948975-resume-single-conference-group

Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
(cherry picked from commit 7354e63bc91309895b85ca711baa5caff2991c73)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/a219e492b25e
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #14870 from gasolin/issue-952244

Bug 952244 - Remember my choice is showing up again on gUM audio permiss..., r=alive
(cherry picked from commit 1584816093182199576467b63d8c7e19c035a3a8)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/3c29a1fe24ce
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #14214 from crh0716/944230

Bug 944230 - Remove the use of IccHelper r=rik
(cherry picked from commit 9a222ac02db176e47299bb37112ae40aeadbeca7)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/4b332952a890
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #14633 from gitmai/bug-948798-CC-reset-wifi-not-refresh

Bug 948798 - [Cost Control] After reset Wifi usage, the usage does not b...
r=me
(cherry picked from commit 0a682dc32194b4f66a811f6cd2dbe423458bfb99)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/9f7cfa066bae
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #14962 from EverythingMe/946724-collections-unsupported-locale

Revert "Revert "Bug 946724 - [e.me] Collection suggestions for unsupport...
(cherry picked from commit baf9f72b71fb126999c6b455363f6a207b7c49bd)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/3b7e85209b36
Author: Albert <acperez@tid.es>
Desc: Merge pull request #14866 from acperez/bug-951450

Bug 951450 - Flashing customizations currently fails with exception. r=yurenju
(cherry picked from commit 1ca7f67b46cf840202bb122273d9de51ba4e3026)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/81446a272e90
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14540 from jmcanterafonseca/fix_fb_flashing_imgs

Bug 946064 - [fugu][buri][contact] contact photo refresh when taping on ...
(cherry picked from commit 7173a82a65719aeae83c5b393f1320368bc4b5c0)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/bd6d6d87f342
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #14740 from rexboy7/fix-bug946730

bug 946730 - [Dialer] Do not show "xxx left" when hanging up the whole group call. r=etienne
(cherry picked from commit a49881df9a1ca48cea47e2e274cfa85a976e18bd)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/39950214def2
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #14840 from gtorodelvalle/contacts-bug-946260-broken-links-when-scrolling

Bug 946260 - [Contacts] Broken link image shown for contacts when scrolling instead of their photo
(cherry picked from commit ae731e303597aac1cb00657e5e60e4e9f58f4013)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/2af050847ed5
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #14751 from TheoChevalier/call-waiting-switch-fix

Bug 951123 - [Settings] Call waiting switch on "Confirm Call waiting", r=kaze
(cherry picked from commit b12152456063166e3539e59a3d476b7bde8cffe4)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/5c8b3f7d1797
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14806 from gtorodelvalle/contacts-bug-949470-ben-kelly-patch

Bug 949470 - [Contacts] Broken image links when entering the search mode
(cherry picked from commit adba622b1072a94426ba618fb3e407e4393461df)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/6033def5b554
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13701 from viorelaioia/bug-932723

Bug 932723 - Add a test to verify that received SMS are notified to the user
(cherry picked from commit 0ef52554acf8cc115e40a95b2eab0117df3dff45)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/ac67b6af4689
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #14639 from crh0716/913326

Bug 913326 - Set voice privacy mode at startup r=alive, jaoo
(cherry picked from commit 8759f9916c119de88e62598d2451b2339011085a)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/a71b452abeff
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #14777 from gtorodelvalle/contacts-bug-948817-enter-clears-custom-tag

Bug 948817 - [fugu][buri][contact] tap on 'enter' on keyboard will clear all input in custom label (r=jmcanterafonseca)
(cherry picked from commit 0e8a73a74ba28715d55c6c657e3befa25cf6c915)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/2ea284824fc1
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14750 from jmcanterafonseca/fix_export_alpha_scroll

Bug 951107 - alpha scroll in export contacts screen is broken
(cherry picked from commit 8bbb5170000bed93d2fe5837d3f9ad4055254cc7)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/5b84c5353416
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14794 from jmcanterafonseca/fix_import_click

Bug 946796 - Import list only honors the :active state the first time a ...
(cherry picked from commit 53ef11f7ddc129af8eeaa96af84c5a7f4c8fdfcf)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/da1875168ff7
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14774 from jmcanterafonseca/export_active_3

Bug 951131 - In the export view when clicking on a contact, the item rem...
(cherry picked from commit 87b1a6d97eb44678115b4653e9a21e80eeeedc27)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/3baf4b64887f
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #14654 from arcturus/bug-944572

Bug 944572 - [DSDS] Even if SIM card is in slot 1 which is SIM2, import and export function of Contacts app will still show SIM1 in the list.
(cherry picked from commit 44641af542c8a4fc507a7dc676083e93abf16976)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/0eaf7ee0b7d9
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #14646 from Neeraj-Seth/bug-949034_lock_screen_off_reappear

Bug 949034 - Fully disable lock screen even if passcode is set, r=arthurcc, alive
(cherry picked from commit 11e24c6988fe586f65ce6a7ad29783046ad44254)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/36c160a4aa2d
Author: crdlc <crdlc@tid.es>
Desc: Bug 950671 - Detail contacts shows the previous photo contact for a while and the animation is not very synchronized

(cherry picked from commit ee40eaadd571c1ab63a82a983a5edfb3a11d27c6)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/44dc7d2d91a9
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #14749 from alivedise/bugzilla/948875/fullscreen-entry-points

Bug 948875 - Fix browser config helper on entry point parsing, r=timdream
(cherry picked from commit 24f392914a46c7de8ec3f33d4da0c35a2133c3e9)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/cb86aafe2b3e
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #14782 from pivanov/bug-943701

Bug 943701 - [Settings] the “Do Not Track” panel is broken
(cherry picked from commit 0e153b7211eb525d448470fdcabbd0f22663f9a0)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/e4f3b38afb55
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #14582 from EverythingMe/948994-disable-report

Bug 948994 - [e.me] Temporarily disable stats reporting [r=amirn]
(cherry picked from commit 5123f0dc6f4712c60b4714579b7cc6a9644c8542)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/2221c9dee332
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14670 from julienw/947977-fix-scroll-when-typing

Bug 947977 - [Messages] Bug 936370 regressed the scrolling behavior when...
(cherry picked from commit 84998e3106d7b622dfa940959b7ecd682a3c99b9)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/4ffe3a766775
Author: crdlc <crdlc@tid.es>
Desc: Bug 939524 - Origin collision when installing and bookmarking the same app

(cherry picked from commit 6521f1281803562578c5743d4e05cfbedf3db02c)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/a95f24952584
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14669 from julienw/950074-fix-new-message-notice

Bug 950074 - [Messages] The "you received a message" notice has a bad la...
(cherry picked from commit 1f275beb53779feb31e1b00611c5e85428c431ae)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/175e46cf15e8
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14504 from etiennesegonzac/bug-943716-flatfish-contact-bug

Bug 943716 - Don't try dialing from the contact app if if mozTelephony is unavailable. r=arcturus
(cherry picked from commit 5705238b2a9864771fb15073552a4e4ca8f4631d)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/c77e94db73d9
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917674 - [Contacts] Passive matching and merging when SIM contact's name is the same than an addressbook contact's last name

(cherry picked from commit 241d2237e2c4f5876d0ef3ec3906b993e39dbdd7)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/6aa630d09977
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #14685 from timdream/settings-back

Bug 947033 - Allow Settings to be called by activity without being a dialog, r=rudyl,arthurcc
(cherry picked from commit de298a34c9673098665d44ce361f402f6c2b8a16)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/092da2911b42
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #14701 from jaoo/946309

Bug 946309 - Include operatorsizelimit for MMS in a new market. r=kaze
(cherry picked from commit b34c6d84d26f06168107e6214a70eacdd4f50104)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/260cf82a2bfb
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #14616 from jaoo/946299

Bug 946299 - Enable strict7bit enconding for a new market. r=kaze
(cherry picked from commit 358cd74fd2b2ef5d541f71a5d53d65d6a7335424)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/f77230137cc1
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #14622 from rnowm/942907

Bug 942907 - asterisk * sign for favorites wraps into main space with long contact names
(cherry picked from commit e2e7add56f545f2086ab15525ba20b111e5e386f)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/61c60e8a4b15
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #14658 from lissyx/bug950070

Bug 950070 - Perform correct localization of the roaming notifier on lockscreen r=kaze
(cherry picked from commit ff5a87e8c13c14d14f04ce912b473c199f4ab870)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/a3adbcf7677e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14463 from julienw/946678-use-href-for-activity

Bug 946678 - [Messaging] Creating a new message from contacts does not o...
(cherry picked from commit 9bc5f1fd67b42404db3e80e7ef5eb8b9f0802c59)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/cababd037ab5
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14645 from jmcanterafonseca/fix_flush_final2

Bug 949422 - If a Facebook Friend is removed (from the import list), the...
(cherry picked from commit 1c0e45902d5203232ad339b1ba53f8a52bb962a6)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/fce456766f0a
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #14581 from gtorodelvalle/contacts-bug-938261-contact-update-activity

Bug 938219 - [Contacts] Unable to select a contact via the contact update activity (r=jmcanterafonseca)
(cherry picked from commit 390b313a254a947d12e3cdbcde19d7d1619ff63c)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/c8a3481478ed
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14546 from karlt/943138

bug 943138 - improve dialer ADSR envelope r=etienne
(cherry picked from commit 3330e45ecd79a12241663db8bd1799cdfccd1451)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/42cfcec42ba0
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #14497 from rnowm/FB-header

Bug 946775 - [contacts][facebook] When importing contacts, blue facebook...
(cherry picked from commit 1224458b1ae7671cba7df000f295a771a62966db)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/1c7d098dcc8a
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #14630 from snowmantw/issue948789

Bug 948789 - Lockscreen can be unlocked without using normal gestures
(cherry picked from commit b34f90f2e213a901cd2aec00342dafd3d4af6960)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/81f97899d3fb
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #14596 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 949326 - [DSDS][MMS] Switching data call follow-up fixing for default service ID type changes, r=julienw
(cherry picked from commit 3190875284dd76bb98e4e7386edcf91573d25e7e)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/33a6157f0e8f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #14624 from timdream/statusbar-animation-icon

Bug 946173 - Update and remove unused and duplicate status bar icon files, r=alive
(cherry picked from commit ca82b55fe4b93b7706836406d91bc87e5dca89e5)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/2625314632d2
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #14605 from EverythingMe/949392-music2

Bug 949392 - [e.me] 'Music2' removed from 'Music' collection when adding a web app [r=ranbena]
(cherry picked from commit 60fdc90f3463f5327d889c7caa2b5f1c8bf0abf2)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/dc187753bcc3
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #14564 from EragonJ/bug-948769

Bug 948769 - [Settings][DSDS] Default service ID should be a number
(cherry picked from commit dc063ebf9efe13e341dda2b4d93da7fd34d8d4d4)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/50beb2051ebf
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #14542 from punamdahiya/Bug947028

Bug 947028 - Fix of overlapping checkboxes while selecting ring tones r=davidflanagan
(cherry picked from commit dea74850442df6aff8405333a973d49a9f1af2ec)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/5c7315c50cb8
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14567 from jmcanterafonseca/fix_export_sim_948862_master

Bug 948862 - [Contacts] The first time exporting a contact to SIM create...
(cherry picked from commit 3b59454125a4535ca26cc5f478a9073393d374f9)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/976ebc0be908
Author: crdlc <crdlc@tid.es>
Desc: Bug 924843 - Icons on grid do not re-arrange automatically when dragging over collections

(cherry picked from commit 0294f589b11ad5f53250f8713fb82f59e55c0fcc)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/c5bef6b54066
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14525 from karlt/942751

bug 942751 - stop OscillatorNodes when done to work around bug 897796 r=etienne
(cherry picked from commit 577f46a9a8f3f16540c007fa420bd5630c5f2ae3)
Bumping gaia.json for 1 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/7b316044316d
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #14784 from nullaus/bug949286-net-error

bug 949286(cherry picked from commit 6bf24fc3ce7947b70acd2c6f915804f760543fc8)

Fixed Conflicts:
	apps/system/js/net_error.js