Merge pull request #14088 from mikehenrty/bump-marionette-helper

use new marionette helper, adds waitForElementToDisappear
Merge pull request #14235 from mihai/bug_944214

Bug 944214 - [Settings] Update list buttons to match BB. r=@crh0716
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
Merge pull request #14233 from svic/rebase-80717b22-ShrinkUI

Bug 943179 - Integrate P2P / Shrink UI to nfc_manager, r=alive
Bug 897325: Part 3 - preload apps for certain carriers
Merge pull request #14175 from yurenju/minilla-sim4

Bug 897325: Part 3 - preload apps for certain carriers r=@ochameau f=@acperez
Bug 945597 - Get default orientation by locking orientation default on booting
Bug 945080 - "White dots" appears above and below the camera icon for 1.5dppx phones
Bug 911108 - [music] change the hash and option to mix page when the player is reset by the storages
Bug 943103 - [B2G][Email] Subject and snippet overlap attachment and flagged icons, may cause snippet to wrap so as to not be visible. Regression from bug 917895. r=jrburke

Note that r=jrburke is coming from bug 917895 where James's review request
intent was for this but a misunderstanding resulted in the opposite of the
request happening.
Merge pull request #14280 from bhearsum/master

Disable e-mail notification because it's Very Spammy. r=yurenju
Merge pull request #14254 from snowmantw/issue945080

Bug 945080 - "White dots" appears above and below the camera icon for 1.5dppx phones
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
Bug 911968 - [HD]Center rotation point of refresh icon off
Bug 945624 - Unxfail test_sms_to_dialer.py
Merge pull request #14296 from alivedise/bugzilla/945597/lock-lockscreen-orientation

Bug 945597 - Get default orientation by locking orientation default on b...r=timdream
Merge pull request #14303 from askeing/945624

Bug 945624 - Unxfail test_sms_to_dialer.py
Bug 945198 - [e.me] Guid cleanup no longer needed [r=ranbena]
Merge pull request #14260 from bobsilverberg/bug945011

Bug 945011 - Update Music app object to use Marionette Actions for tapping
Merge pull request #14297 from asutherland/email-msg-list-regression

Bug 943103 - [B2G][Email] Subject and snippet overlap attachment and flagged icons, may cause snippet to wrap so as to not be visible. Regression from bug 917895. r=jrburke