Merge pull request #10105 from ochameau/contacts

Bug 877595 - Make mozContacts works again with the browser-helper extension r=@vingtetun(cherry picked from commit 8f5a04e02bbb6554774e55a764963094532deb80)
Bug 816135 - [Settings] - Need assets for the wifi icons, r=kaze(cherry picked from commit 6d8ee303fbafa200c87546ac1470214dd2334697)

Conflicts:
	apps/settings/style/icons.css
Merge pull request #10127 from lissyx/bug877999

Bug 877999 - Check that network is not null, r=kaze(cherry picked from commit 6a0b2e542f3f4fd042798ab2bd0c21df523e94a4)
Revert "Bug 869903 - Use black as the default background of packaged apps r=gerard-majax"

This reverts commit cb6d9120b97a50b86da6e5d73d59c844bc2157a8 due to regressions.
Merge pull request #10014 from ferjm/call-log-upgrade-v3-fix

Bug 876358 - [Call log] 'retryCount' should be 1 for new group calls. r=...(cherry picked from commit d382a2893bdc523a780df67f7cecd2aef70f5cf3)
Merge pull request #9943 from huchengtw-moz/gallery/Bug_863885_far_left_border_effect_does_nothing

Bug 863885 - [Gallery] Far left border effect does nothing to the image, r=@davidflanagan(cherry picked from commit b9b9d23e148fbfd7289adb83c09f1a0d107684d4)

Conflicts:
	apps/gallery/style/gallery.css
Merge pull request #9926 from bentian/bug-874731

Bug 874731 - [Video] Video app doesn't show recorded video if video db w... r=davidflanagan(cherry picked from commit 2f4d9cf0bcaaa4da5bbb9801a079b3ffaa7e4209)
Bug 877960 - Update FTE to include geolocation notice r=fabrice a=leo+
(cherry picked from commit d29032e263c99842cd17dbd9a4d5be0117e770e4)
Bug 877970 - FTU uses wrong attribute for telemetry checkbox r=fabrice a=leo+
(cherry picked from commit b81ceb38b2eb044d8bb8a75baf7f551667e79441)
Bug 877960: followup to check the pref by default. r=fabrice a=leo+
(cherry picked from commit 640539e5a7918bff2034a6dc3ab4e2d43ff19b64)
Bug 877960 - followup to fix UX stepbar (r=fabrice)
(cherry picked from commit d0e0de3a35fecffd1f0d1cbd01ebae2a1cfc373a)
Merge pull request #10072 from alivedise/bugzilla/874737_master/lock-orientation-for-inline-activity

Bug 874737 - Lock orientation for inline activity, r=timdream(cherry picked from commit 0c0e0f823d73318289c12187992ec1b29b6da795)
Merge pull request #10123 from huchengtw-moz/sms/Bug_877166_Delete_button_is_not_disabled_when_no_item_is_selected

Bug 877166 - [SMS][Regression] Delete button is not disabled when no item is selected. r=steveck-chung(cherry picked from commit b3dd91ed197f96c698f03e1f67de3a7602d46880)
Merge pull request #10018 from huchengtw-moz/sms/Bug_875564_after_attaching_image_sometimes_send_button_is_still_disabled

Bug 875564 - [MMS] after attaching image, sometimes send button is still disabled. r=steveck-chung(cherry picked from commit e19c6980de1089af7a120be4b49d49a6bb5d28e4)
Merge pull request #10161 from etiennesegonzac/bug-876640-bluetooth-redial

Bug 876640 - Fix the BT redial command (using the new CallLogDBManager).(cherry picked from commit 0bf354d23c7d4b21225a2935ea201f1bca9fd5a7)
Bug 877079 - SMS with URL's separated with line breaks, only first is detected - r=gnarf37
(cherry picked from commit 551a9aa6c52efbbd6e4129d0af22ba156cda123b)
Merge pull request #10151 from ian-liu/mms/Bug877615_recipients_do_not_clear_after_discarding_a_previous_multi_recipients_message

Bug 877615 - [MMS] New message composer: Recipients field stays expanded after discarding a previous multi recipient message, r=@steveck-chung(cherry picked from commit 61440e3abaf2d94aa4146c9638ec9f99ab19be3e)
Bug 868385 - [Building Blocks] Input fields should be updated
(cherry picked from commit 0a6b5fb302f048422c505c5b283ad2fde8091952)

Conflicts:

	shared/style/input_areas.css
	shared/style/input_areas/images/icons/clear@2x.png
Merge pull request #9951 from lodr/bug-846258-unit-testing-setup

Bug 846258 - Adding unit test infrastructure and tests for application startup cases.
r=@jmcanterafonseca(cherry picked from commit 6a2e916b9f00d2984699c38592b27e23ad6be67d)

Conflicts:
	apps/costcontrol/index.html
Merge pull request #9999 from lodr/bug-875695-move-configuration

Bug 875695 - Moving config files from JSON file in bulild to JS file inside the Usage app
r=@jmcanterafonseca(cherry picked from commit 50b1b19861e8c8bcb43086ea71404498cd15d2d0)