Merge pull request #8941 from borjasalguero/bug_thread_id_rebased

Bug 851032 - [SMS] Receiving a new message it's not properly threaded r=...(cherry picked from commit 86a79ba3fdfb0eb6f593e34887fa89e3553d1a66)

Conflicts:
	apps/sms/js/sms_mock.js
Bug 858118 - [system] fix and reenable unit tests for update manager r=etienne

- fix updatable tests and use the new mocks helper
- reenable update tests without any more change as I couldn't make them fail.
Feel free to disable again if this intermittently fails after all.
- fix lockscreen test for various firefox versions
(cherry picked from commit 3f9979fe26842d90c01e040f57edb9ff59580766)

Conflicts:
	apps/system/test/unit/lockscreen_test.js
Merge pull request #8787 from lightsofapollo/bug-839273-add-gaurds-for-removed-headers

Bug 854292  - Add more safegaurds for headers being deleted while they ha...(cherry picked from commit c3a1298ff0d6ec23d0f1aee4f195be7ffd6ca2fa)
Merge pull request #8983 from jrburke/worker-thread

Bug 814257 email: Move back-end into worker thread, r=asuth, r=jrburke, r=lightsofapollo, r=squib(cherry picked from commit 0649e5e9d2f71c96517bca1b582c706e665bca6a)
Merge pull request #8599 from lodr/bug-835988-string-update

Bug 835988 - Strings update
Cause r+ and l10n feedback+(cherry picked from commit be0a07f1de0681ec72e23f91ff0862f7bddc53a0)

Conflicts:
	apps/costcontrol/style/views/telephony.css
Bug 854842 - Check FTU running before visibility change
Merge pull request #9038 from alivedise/bugzilla/854842_v1-train/check-ftu-running-before-changing-active-audio-channel-visibility

Bug 854842 - Check FTU running before visibility change, r=timdream, a=blocking-b2g:tef+
bug 846197 - removed vivo support information from settings app
Merge pull request #9054 from yurenju/bug-846197-v1-train

bug 846197 - removed vivo support information from settings app, r=evelyn, a=tef+