Bug 831890 - [B2G][GALLERY] Crop Handles (Markers) disappear after changing orientations.
Bug 948580 - [B2G][Email] Send "MAIL FROM" in SMTP probe to validate e-mail address.
GELAM changes included here.
Bug 968110 -[costcontrol] Javascript error when open a notification when the application is closed
Bug 968852 - Alarm check sign overlays the notification.
Bug 963917: reduce Gallery memory use (and fix leak) while scanning

force software canvases for thumbnail and preview creation with willReadFrequently

Free canvas memory after creating a thumbnail

Make sure our thumbnail blobs are file-backed not memory-backed

update mediadb docs
(cherry picked from commit 4b5eaa4a2823d8961b80a3b975b1eeed92b9fcb7)

Conflicts:

	apps/gallery/js/MetadataParser.js
	apps/gallery/js/gallery.js
Bug 970996 - Device serial would be initialized under get_device_manager. r=
Bug 952797 - Reactivation the dialer keypad integrations tests.
(the marionette issue was fixed by bug 891882)
GELAM changes for RCPT TO
Bug 930563 - [B2G][L10n][Clock] Chinese Traditional: Highlight date instead of first number displayed.
Bug 897873 - [Buri][WIFI][language]Secrecy information of AP are not translated automatic
Bug 960705 - [clock][l10n] Close button should say Stop instead; r=reviews
Bug 968071 - Taken/Shoot date in image/video info not localizable

This approach let us reuse an existing string, so it can be ported to
1.3

Note that this also changes the en-US format from mm-dd-YYYY to
mm/dd/YYYY
Bug 971631 - Correct screenshot dimension
Bug 951586 - [DSDS][STK] Suport multiple cards in system STK code, r=timdream
Bug 971604 - Video: make header "month date" localizable in thumbnail mode
Bug 955626 - Change start_b2g wait in GaiaTest to wait for AppWindowManager to acknowledge the active frame instead of js event
Bug 971647 - Ignore load script error in blanket
Bug 971691 - "day view header copy should not overflow" marionette js test is failing
Merge pull request #16214 from millermedeiros/971691-travis-day-view-header

Bug 971691 - "day view header copy should not overflow" marionette js test is failing r=gaye