Bug 885269 - [browser] about.css typo in v1.1
Revert "Revert "Merge pull request #10223 from lightsofapollo/clean-removal-of-events""

This reverts commit 258db40f9850558638c0fb3addbe7a203cbb14c4.
Merge pull request #10229 from lightsofapollo/hide-loading-area

Bug 876796 - Hide event details until they are loaded.
Merge pull request #10503 from gasolin/browsercss

Bug 885269 - [browser] about.css typo in v1.1, r=benfrancis
Bug 883616 - Bug 882607 resolution introduced a XSS vulnerability r=gnarf

Carefully escape the body before injecting it into the document
Added some tests to ensure this for both SMS and MMS.
(cherry picked from commit 079b57f45f2e272ceb4e0f3f067cc3d829b3f2b4)

Conflicts:
	apps/sms/test/unit/mock_utils.js
Bug 859167 - Prevent touch events on homescreen during app to app transition
Merge pull request #10556 from alivedise/bugzilla/859168_v1-train/touch-event-to-homescreen-during-app-transition

Bug 859167 - Prevent touch events on homescreen during app to app transi...r=timdream,a=leo+
Merge pull request #9621 from jaoo/869873

Bug 869873 - [Settings] Disable both 'Call Settings' and 'Cellular & Dat...(cherry picked from commit 4918f1d0de02d39e818b0c209ff5a168720d2bfc)
 - Also fixed Bug 884142
Merge pull request #10450 from crh0716/866376

Bug 866376 - Change icon of enable storage(cherry picked from commit 05c03cbf2a25e417116665273aa8ee809c48e3fc)
Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen
Bug 876754 - Use comma instead of | separator in contact auto suggestion - r=gnarf

Closes gh-10111
(cherry picked from commit 86d7da26f2a4468e46686006d5f09b09c6175db9)
Fix Tests From Bug 876754 - 86d7da2 a=npotb
(cherry picked from commit 26b9f19d10c0009c2fc1c950fa3341dfa9e9235c)
Bug 881716 - [SMS/MMS] Search result for contacts from Messaging app is not showing the carrier r=arcturus

- Ensure that either "Type | Carrier" or "Type | PhoneNumber" displays in thread subheader
- Ensure that "Type | Carrier, Phone" displays in contact search results
- Ensure that "Phone" displays in contact search results when no type or carrier exists

https://bugzilla.mozilla.org/show_bug.cgi?id=881716
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 3c65d31e4e72fd2ee368ff3671f0c65e4f7eb956)
Merge pull request #10374 from rwldrn/882899

Bug 882899 - [SMS][MMS] Utils.getContactCarrier throws TypeError if tel not found (found is undefined)(cherry picked from commit 64046475f5762d32711cf6e10390b8f35d770dda)
Bug 883309 - [MMS] Participants' names are double-escaped r=gnarf37
(cherry picked from commit 32112b10072e82ac8d52be891d09685f8eaa02f8)
Merge pull request #10565 from ian-liu/v1_train/Bug883737_screen_layout_size_is_exceeded_in_pop_up_dialog

Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen(v1-train), r=@alivedise
Merge pull request #10340 from jaoo/882089

Bug 882089 - Automatic channel configuration for 1.1/DT PL, r=kaze(cherry picked from commit d8df0e4e27d1822f3607e3b2582df318ec653a7f)

Conflicts:
	shared/resources/apn/apns_conf_local.xml
Bug 882095 - Restart the connection only when APN related settings changed(cherry picked from commit 2af068e72bcda7fa37b2bcd00de4d78f999370f9)
Merge branch 'issue-853349' of git://github.com/gasolin/gaia into gasolin-issue-853349

Conflicts:
	apps/camera/js/camera.js
Merge pull request #10304 from jedp/get-rp-tests

Bug 881435 - UI Tests for navigator.mozId.get(); r=ferjm

(cherry picked from commit 278d090ceada5ac7ab0519116cd23a3f2be42267)

Conflicts:
	test_apps/uitest/index.html