Bug 1093393 - v2.1 [email] : Your Name not saved if email setup goes to password card
Bug-1050129 [Gallery] Single file delete delay fix
Bug 1078901 - Confirmation dialog when deleting apps blocks notfications and software home button. r=kgrandon
Bug1088051 - Fix of stuck in image edit window on clicking edit icon immediately after image delete r=djf

Conflicts:
	apps/gallery/js/ImageEditor.js
Bug 1092389 - Add 'ehrpd' to list of CDMA network modes. r=gsvelto
Bug 1093602 - Remove LogShake feature from v2.1 r=janx

The Gecko code for LogShake feature only landed in master. So we should
rather remove the Gaia exposition of this to avoid confusion for users
and developpers.
Merge pull request #25806 from lissyx/bug1093602

Bug 1093602 - Remove LogShake feature from v2.1 r=janx
Merge pull request #25790 from jrburke/bug1093393-v2.1-email-display-name-setup

Bug 1093393 - v2.1 [email] : Your Name not saved if email setup goes to password card r=asuth a=fabrice