Bug 939062 - Improve wait in test_add_contact_to_favorites.py
Bug 932750 - Add helper methods to GaiaData to get and set Gecko prefs
Bug 939283: Revert "Merge pull request #13593 from wanderview/contacts-group-overflow"

This reverts commit 3c73873c8e8ddc8cea9665db0317785e926b286b.
Bug 929668 - [everything.me] Runaway allocations in homescreen app [r=crdlc,evyatron]
Merge pull request #13116 from mcjimenez/bug928134

Bug 928134 - When powering on a device for the first time with a SIM customization variant with app preloads, an app install success notification unexpectedly appears r=etienne
(cherry picked from commit 72758c49ea3097b72a121578b193e54dc95e22cd)
Merge pull request #13693 from RudyLu/keyboard/Bug936723-filter_unprivileged_keyboard_apps

Bug 936723 - [keyboard] don't allow user to enable keyboard apps that
r=gnarf, gary
(cherry picked from commit c943970387dfc74c6c4e71a4e576424e593e8e97)
Merge pull request #13652 from rexboy7/fix-bug933576

Bug 933576 - [Dialer] (regression) Call screen should be shown when ente...
(cherry picked from commit 57a02515fb483ac9cdbcfb7d3ae939667c88db63)
Merge pull request #13614 from etiennesegonzac/bug-936793-call-log-migration-hotfix

Bug 936793 - HOTFIXing a call log idb migration by hardening the Contacts.findByNumber method. r=ferjm
(cherry picked from commit 300a4e05fef44a4f47a3f573446de6311b317434)
Merge pull request #13691 from lissyx/bug929895

Bug 929895 - Blacklist some apps of notifications removal r=alive
(cherry picked from commit f7f616c7b893e215f3a5ffc82d0557d23c4d9c02)
Merge pull request #13714 from jfkthame/patch-2

Bug 914122: Don't use letter-spacing on grid icons, as it results in po...
(cherry picked from commit aae876d22c7b292e9d0413a98ed1c0705da71ac8)
Merge pull request #13556 from lodr/bug-934996-data-error

Bug 934996 - Changing issues indicators and preventing duplicated events...
r=jmcf
(cherry picked from commit c317b614ffb412b474dcb7fd8d533b1978dfae95)
Merge pull request #13530 from etiennesegonzac/bug-933279-conf-call-attention-screen-show

Bug 933279 - Always displaying the call screen attention screen for each extra incoming or outgoing call. r=alive
(cherry picked from commit 31bafc02e542d708978104d20dceaaf229ad967f)
Merge pull request #13794 from Rik/conference-call-hold-925359

Bug 925359 - Tapping on the Group call layer holds the call r=etienne
(cherry picked from commit cf1d0258db4f8c057bd9a2810f45767adb5a47a6)
Merge pull request #13825 from dwi2/bug940162

Bug 940162 - Modify params passing to SimPinDialog.show in order to accommodate recent change r=kaze
(cherry picked from commit cf1d27119bc4943552b41adc41248399b405a680)
Merge pull request #13686 from mpizza/Bug_910697_KMmodify

Bug 910697 k mmodify
9cf631e.   r=rudyl, GaryChen.
68b5002.  r=timdream.
(cherry picked from commit 606c7446add4af53c1f1e8849d98416c00b5b938)
Merge pull request #13789 from crdlc/bug-933561

Bug 933561 - App does not come to foreground if user quickly toggles bet...(cherry picked from commit 4e2a68ccd5eb0af576855777b752b4053477575e)
Merge pull request #13867 from timdream/lockscreen-unlock-transition3

Bug 937630 - All you need is ... smooth unlock transition, r=vingtetun
(cherry picked from commit 45f65f707ae1d724c48c4ebf439d1617c35bbe42)

Conflicts:
	apps/system/js/lockscreen.js
Merge pull request #13539 from EverythingMe/929668-retry-logs

Bug 929668 - [everything.me] Runaway allocations in homescreen app [r=crdlc,evyatron]
Merge pull request #13892 from RudyLu/keyboard/Bug941440_correct_Macedonian_layout

Bug 941440 - The layout of Macedonian keyboard is incorrect - the space
r=timdream (cherry picked from commit d04ccfacdaf820b888f613dcae9a40d7e2a88f7e)
a=timdream
Bug 935307 - [B2G][Contacts] A user is able to retrieve a contact information from Settings screen.