Bug 927870 - Neaten up UI Tests app's app object
Bug 944645 - [v1.2] Unxfail test_gallery_crop_photo.py
Bug 943337 - Merge all 2 kill cards view tests into one.
Merge pull request #14212 from AndreiH/bug944645

Bug 944645 - [v1.2] Unxfail test_gallery_crop_photo.py
Merge pull request #14131 from AndreiH/bug927870_v1.2

Bug 927870 - Neaten up UI Tests app's app object
Bug 934446 - Test Messages contact input validation
Enabling the test on tbpl for v1.2
migrate music app tests to app object
Bug 937584 - Modify test_sms_to_dialer.py to use SendSMS atom

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/messages/app.py
Merge pull request #14230 from bobsilverberg/tbpl_contact_input

Bug 934446 - Test Messages contact input validation
Merge pull request #14261 from bobsilverberg/pr14027

Bug 921514 - Create app object for the Music app
Bug 943441 - test_import_contacts_from_gmail is failing on master for the wrong reason
Bug 945368 - [v1.2] Xfail test_everythingme_app_install.py due to long_press bug
Bug 941567 - [Keyboard][V1.2] The keyboard name of notification bar is incorrect
     -- since keyboard show timing is depends on 'mozbrowserresize' event,
        so call 'showIMESwitcher' in the end of 'resizeKeyboard'
        to make sure refresh latest information at each time while keyboard layout is chnaged.
     -- ignore mozbrowserresize event while keyboard Frame is hidding.
Merge pull request #14293 from mpizza/Bug_941567_v1.2

Bug 941567 - [Keyboard][V1.2] The keyboard name of notification bar is i...
(cherry picked from commit fc3ef53)
Merge pull request #14249 from RudyLu/keyboard/Bug942065-make_auto_suggestion_output_full_word

Bug 942065 - [b2g] auto suggestion uses truncated/shortend words.
r=timdream(cherry picked from commit 38bb3f608bafeda965274abfe941678197e2da2a)
Merge pull request #14075 from dominickuo/bug-911108-new

Bug 911108 - [music] change the hash and option to mix page when the player is reset by the storages, r=huchengtw-moz(cherry picked from commit 2758561ca39d2d2c30a4425f087515284b6c095f)
Merge pull request #14275 from bobsilverberg/xfail_eme_install

Bug 945368 - [v1.2] Xfail test_everythingme_app_install.py due to long_press bug
Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible
Bug 940295 - Refactor test_calendar_new_event to use default date values. Also clean up calendar app locators

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/calendar/manifest.ini
Bug 945011 - Update Music app object to use Marionette Actions for tapping