Bug 943337 - Merge all 2 kill cards view tests into one.
Bug 937584 - Modify test_sms_to_dialer.py to use SendSMS atom

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/messages/app.py
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
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
Bug 945227 - tap_back_from_import_contacts needs a stronger wait r=me
Merge pull request #14135 from crdlc/bug-942294

Bug 942294 - unable swipe from e.me to apps page if swipe starts at edge...
(cherry picked from commit 833afc850d7a62a15ff1b178db806210f2ac839f)
Merge pull request #14113 from rexboy7/fix-bug933153

Bug 933153 - hold active call before making another call. r=etienne
(cherry picked from commit 286be9eb5ffc0e879d05703f0d291b5efbd818e6)
Bug 935273: don't decode full-size image during pick activity unless necessary

Modify ImageEditor to have a "crop only" mode where it displays
only a preview image and crop handles and does not do other image editing.
In this mode it does not decode the full-size image unless the user actually
crops the image.

Address review comments; handle orientation change; handle case where image has no preview
(cherry picked from commit 16079236610d093aec86c62243eb9987ab8d3dd6)

Conflicts:

	apps/gallery/js/ImageEditor.js
Merge pull request #13824 from huchengtw-moz/video/Bug_938967_00-00_is_not_handle_correctly

Bug 938967 - [fugu][hamachi]The video had be sought to 00:00 could not b..., r=djf
(cherry picked from commit fe33351a4a460172212ad234b1a98ba2dcd29ac4)

Conflicts:
	apps/video/js/video.js
Merge pull request #14334 from huchengtw-moz/video/bug_938967-v1.2

Merge pull request #13824 from huchengtw-moz/video/Bug_938967_00-00_is_n...
Merge pull request #14059 from rexboy7/fix-bug928597

Bug 928597 - [Dialer][CDMA] Show switch call text in proper font size(cherry picked from commit 77420f0568432a3ed236137e27caa8cd832eed8c)
Merge pull request #14342 from davidflanagan/bug935273-v1.2

Bug 935273: don't decode full-size image during pick activity unless nec...
Merge pull request #14314 from AndreiH/bug_943865_v1.2

Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible
Merge pull request #14315 from AndreiH/bug_940295_v1.2

Bug 940295 - Refactor test_calendar_new_event to use default date values...
Merge pull request #14317 from AndreiH/bug945011_v1.2

Bug 945011 - Update Music app object to use Marionette Actions for tappi...