Bug 933709 - Write test for geolocation prompt
Merge pull request #13367 from stupchiy/issue_933075

Bug 933709 - Write test for geolocation prompt
Bug 930532 - Python use self.apps.displayed_app in Gallery app object
Revert "Merge pull request #13230 from fbukevin/issue929377"

This reverts commit cca35de2ff8993be019b3da889bac406915cc212, reversing
changes made to 31687ef383bc1b85a9d388fb3dde610ab7e8f8fd.
Merge pull request #12134 from fabi1cazenave/macAddress-bug895739

Bug 895739 - [Wi-Fi] MAC address is always displayed as "not available", r=Arthur
Merge pull request #13385 from zacc/bug_935052_1

Bug 930532 - Python use self.apps.displayed_app in Gallery app object
Bug 924475 - [Messages] The context menu is missing the contact name and mobile type r=borja

Do not output a header if this is a known contact
Merge pull request #13354 from julienw/924475-master-fix

Bug 924475 - [Messages] The context menu is missing the contact name and...
Bug 935041 - Investigate test_sms_add_contact failure, resolve and re-enable the test
Merge pull request #13388 from zacc/bug_935041

Bug 935041 - Investigate test_sms_add_contact failure, resolve and re-en...
Bug 934768 - [e.me] API key change for v1.2 [r=crdlc]
Add truncation to avoid MMS filename limitation r=rwaldron
Merge pull request #13300 from davidflanagan/bug915001hd

Bug 915001 - save edited images using tiles and display a progress bar r=hshih(cherry picked from commit d19550e2fb7331d5e4a54e8e998753378e7fd44a)

Conflicts:

	apps/gallery/index.html
	apps/gallery/js/ImageEditor.js

fix lint
bug 935052 - fall back to top-most frame after closing call in dialer tests
Merge pull request #13393 from davidflanagan/bug915001

Merge pull request #13300 from davidflanagan/bug915001hd
Merge pull request #13387 from zacc/bug_935052_phone

bug 935052 - fall back to top-most frame after closing call in dialer te...
Bug 933592 - The composition string is overlapped with the "I'm thinking of..." string in the search box of everything.me [r=ranbena, evyatron]
Merge pull request #13369 from EverythingMe/v1.2-apikey

Bug 934768 - [e.me] API key change for v1.2 [r=crdlc]
Bug 935070 - [Download Manager] New shared component DownloadUI
[Download Manager] Download list view skeleton