Bug 873931 - Statusbar does not show when fullscreen is canceled.
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)
Merge pull request #10125 from leob2g/Bug_873365_FTE_Screen_Fires_Fastly

[Cost Control] Bug_873365_FTE_Screen_Fires_Fastly
r=lodr(cherry picked from commit fe089acc9b6156470355a5e1b0ff8eac76ce2dfb)
Merge pull request #10064 from basiclines/costcontrol-fixes

Bug 874058 - [Cost control] In FTE VIVO SIM case the text and the buttons are not formated properly(cherry picked from commit 4a5c375d42a7b673027bc5bab6db573fd7a3d211)

Conflicts:
	apps/costcontrol/style/views/settings.css
Merge pull request #10086 from lodr/bug-877157-implement-new-vivo-protocol

Bug 877157 - New VIVO SMS protocol
r=@jmcanterafonseca(cherry picked from commit d2ad0f1a5a6be8a2d6df721ba3c2b33e037c423b)
Bug 877615 - [MMS] New message composer: Recipients field stays expanded after discarding a previous multi recipient message - r=gnarf37

- #messages-recipients-list is declared "singleline" in markup
- Test to enforce recipient list always begins in singleline mode

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>

Closes gh-10193
(cherry picked from commit 59ee4a159e2e313b736de4ea10e30049d4d93d40)
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(cherry picked from commit b01f01ab2a948e5a08d274c212e56435c68c4875)
Bug 871840 - [MMS] Compose placeholder text obscures clickable area r=julienw

Because the placeholder element is intended to simulate the HTML5 form
'placeholder' feature, it should not receive click events.
(cherry picked from commit 9c312506e1bb131830fdd12b08d35e1d52fd5dc1)
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`.
(cherry picked from commit bbfbce4abf7244be25bb02eb8aa710ba41ede036)
Merge pull request #10163 from fabi1cazenave/i18nCarrierSettings-bug874715

Bug 874715: [Settings/carriers] untranslated 'automatic' string, r=evelyn(cherry picked from commit f9318db4067b23842b3ac16bc2956a6e3c38e306)
Bug 875690 - [MMS] [UX] Thread view. Wrong alignment of elements - r=gnarf

Closes gh-10091
(cherry picked from commit 7c21892f8bc7c348a24bef5256ee745f78f5300c)
Bug 870608 - Restoring volume on phone start
Merge pull request #10198 from alivedise/bugzilla/870608_v1-train

Bug 870608 - Restoring volume on phone start, r=alive, a=tef
Merge pull request #10176 from leob2g/Bug_873931_Statusbar_does_not_show_when_fullscreen_is_canceled_v1-train

Bug 873931 - Statusbar does not show when fullscreen is canceled. r=alive a=leo+