Bug 943317 - add a timer for expiring disableTap
Merge pull request #14435 from huchengtw-moz/camera/Bug_946803_transform-origin

Bug 946803 - [B2G][Camera] After user opens new photo from thumbnail in ..., r=djf(cherry picked from commit 06386175236ae1618663163849343172668dbdec)
Merge pull request #14620 from davidflanagan/bug946803-v1.2

Merge pull request #14435 from huchengtw-moz/camera/Bug_946803_transform...
Merge pull request #12286 from EragonJ/bug-914317

Bug 914317 - Add a check to remove title in prompts, r=@alivedise
(cherry picked from commit fb4fd23a83ca439d317238e8cba0d72d13990d44)
Merge pull request #13853 from bgirard/HomescreenBorder

Bug 939392 - Remove invisible border for better performance. r=crdlc
(cherry picked from commit 019275e2e193ce7e9b5ac5f362af93ac0773722a)
Merge pull request #14391 from huchengtw-moz/gallery/Bug_945355-2

Bug 945355 - [B2G][Gallery] Viewing picture recieved in email or MMS sho..., r=djf
(cherry picked from commit 445cbc90e986d0d47194216eabd89a24f4a0f671)
Merge pull request #14517 from dmarcos/bug948143

Bug 948143 - [gallery] Replace giant icons with reasonably sized one
(cherry picked from commit 329d2e6d2cf73ffe20a21c365a2015de54e7b83d)
Merge pull request #14392 from huchengtw-moz/gallery/Bug_946327_two_activity_handling

Bug 946327 - [B2G][SMS][MMS] Tapping multiple times rapidly on a sent or..., r=djf
(cherry picked from commit 38bddda919bcfa87abb1017a0c5484bdf7d0351c)
Merge pull request #14594 from evelynhung/issue-943317-v1.2

Bug 943317 - add a timer for expiring disableTap
Merge pull request #13955 from fcampo/exported-label-translate-929552

Bug 936889 - Followup for bug 929552 - Sync string for exported contacts (r=pike)(cherry picked from commit 10e5cd63155a41927b9fa3b5a2bd0726ed85f1ab)

Conflicts:
	apps/communications/contacts/locales/contacts.en-US.properties
Bug 949315 - Travis unit test failure on v1.2: initGridManager is not defined
Merge pull request #14657 from mcjimenez/bug949315_v1.2

(v1.2) Bug 949315 - Travis unit test failure on v1.2: initGridManager is not defined
Bug 944271 - [OTA][Data Migration][Clock] The alarm events will...
   be lost after update from v1.1 to v1.2

Adds a routine to startup.js to convert old Alarm entries to the
new format.

(cherry picked from commit 979a3db21abd154efef337686e7a15d846c3d65f)
Merge pull request #14614 from Rik/call-screen-banner-multiline-946742

Bug 946742 - Message overlapped during multiparty when a call is released r=etienne
(cherry picked from commit 0ee9b91a5cf770c099ecaeaadf85fec9c493f53d)
Bug 930402 - Part II, set/remove keyboard.current in keyboard app