Bug 939062 - Improve wait in test_add_contact_to_favorites.py
Bug 933815 Added a smoke test which launches the marketplace app
Bug 933817 - Removed all marketplace tests (excluding smoketest) and its app folder
Bug 925685 - Make test keyboard app change its window height correctly, r=timdream
Merge pull request #13933 from luke-chang/925685_test_keyboard_app_height_v1.2_uplift

Bug 925685 - Make test keyboard app change its window height correctly
(cherry picked from commit 18024ff6a29439023b546c6f269bc964e0aadc32)
Bug 941885 - Hide 3rd-party keyboard apps under a settings db entry
Bug 941885 - (v1.2 only) Set pref to off
Merge pull request #13946 from timdream/keyboard-pref-off-v1.2

Bug 941885 - Hide 3rd-party keyboard apps under a settings db entry (and disable in v1.2), r=rudyl
Merge pull request #13901 from AndreiH/bug933815_v1.2

Bug 933815 Added a smoke test which launches the marketplace app
Merge pull request #13902 from AndreiH/bug933817_v1.2

Bug 933817 - Removed all marketplace tests (excluding smoketest) and its...
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
Revert "Merge pull request #13946 from timdream/keyboard-pref-off-v1.2"

This reverts commit 7bd5adfa1f201dc7b9cfbc8e555faef0b75b944c, reversing
changes made to 7b24f1d1f167fc40b1e887f4ff3746d383af3c2f.