Bug 921424 - Replace wait for landing page after unlocking with wait for displayed app to be homescreen
Bug 935915 - Change test_everything_me_search for a more generic search term
Uplift for v1.2
Bug 930532 - Python use self.apps.displayed_app in Gallery app object
Merge pull request #14082 from bobsilverberg/cp4a66557

Bug 930532 - Python use self.apps.displayed_app in Gallery app object
Merge pull request #14081 from bobsilverberg/eme_search

Bug 935915 - Change test_everything_me_search for a more generic search term
Bug 935052 - Remove launch method from Camera app object
Bug 935052 - Python Remove launch() methods from homescreen tests
Bug 935052 - Remove remainder of spurious launch() methods in the middle of tests
Bug 941582 - Python wait for save progress bar to clear when deleting/editing photos
Merge pull request #14096 from bobsilverberg/008e34cb8d3b40

Bug 935052 - Remove remainder of spurious launch() methods in the middle of tests
Merge pull request #14094 from bobsilverberg/cp394afb37

Bug 935052 - Remove launch method from Camera app object
Merge pull request #14095 from bobsilverberg/0929e242

Bug 935052 - Python Remove launch() methods from homescreen tests
Merge pull request #14098 from bobsilverberg/8a27477d

Bug 941582 - Python wait for save progress bar to clear when deleting/editing photos
Merge pull request #13565 from RudyLu/keyboard/Bug905241_and_Bug925318-disabled_keyboard_tutorial

Bug 925318 - Remove first time explanation on how to close the keyboard. r=rudylu
  - Also fixed Bug 905241.

(cherry picked from commit 1e212079cca612f9a91bd79ad6042f90748ce9d7)

Conflicts:
	build/settings.js
Bug 927131 - Add an automated test to verify that you can import contacts from Gmail
Merge pull request #13977 from alefteris/bug-942580-kb-final-sigma

Bug 942580 - Remove duplicate "final sigma" from Greek keyboard.
r=rudylu(cherry picked from commit 6b4dd7baa58fbba70161d7979d8503f8fb9f64df)
a=timdream
Merge pull request #13975 from alefteris/bug-942575-kb-greek-l10n

Bug 942575 - Translate Greek keyboard menu labels.
r=rudylu(cherry picked from commit 0904f366263eca59f61afb9c340004f91e488870)
a=timdream
Merge pull request #13851 from bobsilverberg/home

Bug 921424 - Replace wait for landing page after unlocking with wait for displayed app to be homescreen
Bug 943817 - Marionette timeouts are lost when using the --restart command line option. r=zcampbell
Bug 943816 - [v1.2] test_export_contacts_to_sdcard intermittent fail