uplift-bug853933: Don't inline all locales as JSON in the HTML
Merge pull request #11321 from fabi1cazenave/uplift-bug853933

Uplift bug853933: Don't inline all locales as JSON in the HTML, r=ochameau
Bug 901044 - Everything.me needs additional strings for the search bar. r=pike
Merge pull request #11161 from huchengtw-moz/media/Bug_891797-2

Bug 891797 - [OTA][Data Migration][MediaDB] Data of Gallery, Video, and ...r=djf(cherry picked from commit ccf877b99ace72e621eb5172f042c6c20aa1297a)

Conflicts:
	apps/gallery/js/gallery.js
	apps/gallery/locales/gallery.en-US.properties

(cherry picked from commit c96a889ca4e23529fcdcdba387a00fa09f67ca8c)
Merge pull request #9849 from hfiguiere/bug867829

Bug 867829 - Part 2: have a dismiss callback for the system banner so we...
(cherry picked from commit 9357244ac6d792c236c755ef7c81a272b615554b)
Merge pull request #10695 from frsela/STK/Bug886808

Bug 886808 - [STK] ICC Settings part cleanup, r=kaze
(cherry picked from commit ffa2ea1ea0221d787b7265d9b15608bf2f55025d)
Bug 895826 - Resolve lack of YT back button r=vingtetun

(cherry picked from commit 06f5557075c578525eddbc90b9687f8b18b6f545)
Bug 897494 - [SMS] should not detect a number starting the next word for part of the phone number - r=schung

* Use word boundary meta char instead of ensuring next character is not a digit - this detects this situation properly

(cherry picked from commit b1ea7ffb32ecd0ab9ff6b263c4363c314e0909a5)
Bug 895826 - followup, r=me

(cherry picked from commit adc94dd96cc417f2c3961b0176c2f2b2d96b9abe)
Merge pull request #11233 from wanderview/contacts-update-tel-type

Bug 898241: Use l10n type for tel update activity.  r=jmcf
(cherry picked from commit 9a802a4b2e6737b914bcab73376f097761875081)
Bug 899003 - [Buri][Buri][SMS] Long press on number in message: menu includes "Call" option r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=899003
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 546a8bf0004be4ac9dbcea0b7f6f407d53219406)
Merge pull request #11291 from cctuan/900355

Comment Bug 900355 - [System] Keyboard show unexpectedly after pressing home from PUK ebtering screen
(cherry picked from commit c5a2d8a6e3e2d16680347a298ab8101f19e178c1)
Merge pull request #10885 from steveck-chung/MMS_resize_utility

Bug 889765 - [MMS] Resizing algorithm is not working properly. r=julienw
(cherry picked from commit d464d6e157d57091e2dd4eff13716fe7a87c4d75)
Merge pull request #11108 from leob2g/Bug_896322_screen_goes_off_after_reset_and_before_FTU_starts_while_power-on_video_is_playing

Bug 896322 - screen goes off after reset and before FTU starts while pow...
(cherry picked from commit 7eea78d212799ebbde7f4b78a05973b397c0b6d4)
Merge pull request #11267 from steveck-chung/Bug-897942

Bug 897942 - [SMS] SMS contact lookup type always displayed in English. r=gnarf37
(cherry picked from commit 13a97bc7a88b5ef5e73f632bf59a5335f0fdae07)
Merge pull request #11325 from dhylands/dhylands-893282-mediadb

Bug 893282 - Fix mediadb to scan all device storage areas. r=djf
(cherry picked from commit 9326784de7dc9e02d5d99dc1740febdb9a2b9327)
Merge pull request #11328 from jimporter/music-fix-mediadb

Bug 901309 - Fix issues with device storage in mediadb.js
(cherry picked from commit deab57d473d02c09d9ccca1f1b5f54b54b5a0525)
Merge pull request #11140 from leob2g/Bug_896958_ShowingWrongErrorMessage_WhenOpeningSMSapp_AfterHomeButton_isPressed

[MMS][896958]Handling the ActivityCanceled event from Gecko in SMS application when Home button is pressed to avaoid application error. r=borjasalguero
(cherry picked from commit fc22e7385dccf60ada2e48f17c465d8662317e44)
Merge pull request #11089 from lissyx/bug894868

Bug 894868 - Reset input textbox value for STK INPUT, r=frsela
(cherry picked from commit 60aefda83553a7d9d96691ec28cc237bdaed571e)
Merge pull request #11295 from fcampo/FB_resolution_images

Bug 900361 - Enable customization per target device of resolution for FB images (r=jmcf)(cherry picked from commit 4b347e4e39b1716b68463dccc63c1b3eb49158b3)

Conflicts:
	apps/communications/contacts/js/import_utils.js
	apps/communications/contacts/test/unit/link_test.js
	apps/communications/facebook/test/unit/facebook_connector_test.js
	apps/communications/import/test/unit/import_test.js