Merge pull request #13504 from jaoo/927486

Bug 927486 - [Settings] Modify Message settings category. r=arthurcc(cherry picked from commit 49b3e8cc689e1c189a86e28c20bc4726d553ee03)

Conflicts:
	apps/settings/elements/carrier_mms_settings.html
	apps/settings/index.html