Bug 864699 - FTU need tests: Added test for SIM Management
Bug 829023 - [Settings] Don't use dividers to separate paragraphs in the same text block

Conflicts:
	apps/settings/index.html
Bug 877595 - Make mozContacts works again with the browser-helper extension
Bug 877166 - [SMS][Regression] Delete button is not disabled when no item is selected
Bug 869903 - Use black as the default background of packaged apps
Merge pull request #10119 from michaelwu/bug-869903

Bug 869903 - Use black as the default background of packaged apps
Bug 873407 - [Buri]Time on status bar won't update immediately when set time in Settings.
Bug 868902 - [Buri]data connection and hotspot still enabled without SIM
Merge pull request #10066 from huchengtw-moz/settings/Bug_868902_data_connection_and_hotspot_still_enabled

Bug 868902 - [Buri]data connection and hotspot still enabled without SIM, r=@alivedise
Merge pull request #10149 from huchengtw-moz/system/Bug_873407_time_on_status_bar_wont_update

Bug 873407 - [Buri]Time on status bar won't update immediately when set ... r=@alivedise
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
Bug 875564 - [MMS] after attaching image, sometimes send button is still disabled
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
Merge pull request #10105 from ochameau/contacts

Bug 877595 - Make mozContacts works again with the browser-helper extension r=@vingtetun
Bug_873365_FTE_Screen_Fires_Fastly

Bug_873365_Review_Changes

Bug_873365_ReviewChanges_Renaming_Function

Startup_test modified for FTE
Merge pull request #10125 from leob2g/Bug_873365_FTE_Screen_Fires_Fastly

[Cost Control] Bug_873365_FTE_Screen_Fires_Fastly
r=lodr
Bug 876640 - Fix the BT redial command (using the new CallLogDBManager).
r=ferjm
Merge pull request #10161 from etiennesegonzac/bug-876640-bluetooth-redial

Bug 876640 - Fix the BT redial command (using the new CallLogDBManager).
Merge pull request #10041 from fcampo/FTU-more-tests

Bug 864699 - FTU need tests: Added test for SIM Management (r=arcturus)
Bug 877776 - [MMS] Attach four images cause input text field can't be scrolled properly r=gnarf37

The call to `composeCheck` in `Compose.onAttachClick` is unecessary.
Previously, it was invoked synchronously after
`Compose.requestAttachment` (before any change in the UI could have
occurred). Because `Compose.append` itself invokes `composeCheck`, it is
not necessary to explicitly call it in the `onsuccess` handler for
`Compose.requestAttachment`.

The maximum Compose input height must be updated when transitioning
between pages to account for differences in the height of each page's
header.

Because we must dynamically update the Compose form's height (see the
`ThreadUI.updateInputHeight` method), it is inappropriate to declare a
static `max-height` on that element.

In addition to setting the maximum input height, the "resize" event
handler should recalculate the height of the Compose form. This enables
proper scrolling within the Compose form when the keyboard is
summoned/dismissed.

Finally, in order to follow convention, this commit declares the
"resize" event handler as a method of the `ThreadUI` object and defers
binding until invocation of `TheadUI.init`.