Merge pull request #13179 from mpizza/Bug_932257_keyboard_not_hidden

Bug 932257 - [keyboard] previous InputMethod will not disappear while sw.... r=rudyl.
(cherry picked from commit d59c9446595eba2677fdcb363b2b42ae52ee0b12)
Bug 925307 - [Contacts] In search mode, clicking INTRO on the keyboard exits the search mode

(cherry picked from commit 0e085759b69f24ef9c8d1299ed1bd4d7a3268528)
Bug 925307 - [Contacts] In search mode, clicking ENTER on the keyboard exits the search mode (follow-up)

(cherry picked from commit bac2948c4ee6aecdd5d622f47866b9631acbd762)
Merge pull request #13274 from mpizza/Bug_932257_v1.2

Merge pull request #13179 from mpizza/Bug_932257_keyboard_not_hidden. r=rudyl.
Merge pull request #13333 from bobsilverberg/v1.2ftu

Bug 933980 - [v1.2] Fix test_ftu_with_tour.py and reenable on v1.2
Merge pull request #13306 from bobsilverberg/v1.2lockscreen

Bug 934132 - [v1.2] Update lockscreen app and tests to be in line with master
Merge pull request #13307 from bobsilverberg/cp12265

Bug 934137 - [v1.2] Update cards view app and tests to be in line with master
Merge pull request #13308 from bobsilverberg/cp918727

Bug 934139 - [v1.2] Update videoplayer app and tests to be in line with master
Merge pull request #13329 from bobsilverberg/cp927126

Bug 927126 - Expand automated coverage around editing of gallery photos
Merge pull request #13327 from bobsilverberg/cp923355

Bug 934235 - [v1.2] Bring over changes in /gaiatest/apps/settings/regions/do_not_track.py
Merge pull request #13312 from bobsilverberg/v1.2camera

Bug 924880 - Need an extra wait in test_unlock_to_camera_with_passcode
Merge pull request #13315 from bobsilverberg/cp922702

Bug 922702 - Investigate test_connect_to_wifi_via_settings_app
Merge pull request #13316 from bobsilverberg/cpmktxfail

Bug 934161 - [v1.2] Update marketplace test and manifest to be in line with master
Merge pull request #13317 from bobsilverberg/cp923402

Bug 923402 - In test_fmradio_remove_from_favorite.py the remove method should wait for the favourite to be removed
Merge pull request #13318 from bobsilverberg/cp924882

Bug 924882 - test_setup_active_sync needs extra wait for setup screen
Merge pull request #13319 from bobsilverberg/browser

Bug 934168 - [v1.2] Update browser app and tests to be in line with master
Merge pull request #13322 from bobsilverberg/cp926944

Bug 926944 - Add a recipient to an SMS using the Contacts app
Bug 920023 - Add gaia command line interface to gaiatest. r=wlach
Bug 922850 - Add hardware button simulation to the Gaia command line tool. r=wlachance
Bug 918740 update the Activities system region locators to suit new menu/button style list r=bsilverberg/bebe

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/system/regions/activities.py