Bug 939062 - Improve wait in test_add_contact_to_favorites.py
Merge pull request #13925 from wanderview/contacts-group-overflow-3

Bug 937291: Limit overflow of each group list.  r=arcturus
Merge pull request #13747 from bobsilverberg/bug939062-v1.2

Bug 939062 - Improve wait in test_add_contact_to_favorites.py
Merge pull request #13265 from mcjimenez/bug930544

Bug 930544 - Allow installing applications on several empty screens(cherry picked from commit 82e8266e56b8d7dc94832d2f94c7f4deef658c96)

Conflicts:
	apps/homescreen/js/grid.js
Revert "Merge pull request #13946 from timdream/keyboard-pref-off-v1.2"

This reverts commit 7bd5adfa1f201dc7b9cfbc8e555faef0b75b944c, reversing
changes made to 7b24f1d1f167fc40b1e887f4ff3746d383af3c2f.
Bug 941885 - Hide 3rd-party keyboard apps under a settings db entry
Bug 941885 - (v1.2) Set pref to off
Merge pull request #13968 from timdream/keyboard-pref-off2-v1.2

Bug 941885 - (v1.2) Hide 3rd-party keyboard apps under a settings db entry, r=rudyl
Bug 934690 - [B2G][FTU] Final screen of FTU does not have image

- this is a v1.2 branch fix
- update steps because depended bug 916262 is not uplifted to v1.2
Merge pull request #13680 from EragonJ/v1.2-bug-934690

Bug 934690 - [B2G][FTU] Final screen of FTU does not have image r=borjasalguero
Bug 941427 - Strenthen is_displayed() and wait for it before dismissing keyboard
Revert "Bug 939062 - Improve wait in test_add_contact_to_favorites.py"

This reverts commit 4b1aeae83c1b331716053304c0d0a9c48d323d4d.
Bug 915672 - Modify marionette test driver scripts to add support for gathering power draw data. r=dhunt r=jgriffin
Bug 941727 - Fix up test_unlock_to_camera

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_unlock_to_camera_with_passcode.py
Bug 938795 - Add endurance test for launching phone. r=dhunt
Merge pull request #13909 from AndreiH/bug941427_v1.2

Bug 941427 - Strenthen is_displayed() and wait for it before dismissing ...
Merge pull request #13785 from snowmantw/issue939434

Bug 939434 - Lock screen handle does not return to its original position when you hit "cancel" from passcode panel, r=timdream
(cherry picked from commit 28e7dd59cf5b8ad9b197c59fbf92603e934e0474)
Merge pull request #13615 from rexboy7/fix-bug923646

Bug 923646 - add duration to conference call
(cherry picked from commit df56d02d9040e3e31f574eb84a7c029600f7e011)
Merge pull request #13881 from AntonioMA/bug936018

Bug 936018 - Change the way the icons are loaded to allow reentrant calls
(cherry picked from commit cdab4981044ddcf0ca32cab6e66a8141556701dc)
Merge pull request #13870 from Pike/bug-940897-localize-inputs

bug 940897, localize inputs in keyboard's manifest.webapp
(cherry picked from commit f936039df67b3f86463f70681dc9e71256d74823)