Bug 933815 Added a smoke test which launches the marketplace app
Bug 933817 - Removed all marketplace tests (excluding smoketest) and its app folder
Merge pull request #13846 from julienw/939971-sms-are-cut

Bug 939971 - [SMS] SMS are cut if you switch App while writing your text...(cherry picked from commit d2b07c096385e37621700c1162cd0803ec9282f6)

Conflicts:
	apps/sms/test/unit/compose_test.js
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...