Merge pull request #10061 from gasolin/issue-876615

Bug 840011 - Remove Vivo bookmarks in the browser r=benfrancis
(cherry picked from commit 32c06cc47e5d2d43333fb23a2f12b2963ba3d1b1)
Merge pull request #11604 from frsela/STK/Bug902768

Bug 902768 - [Buri][STK]No information to user when "alpha ID" is absent or empty within set up call proactive command, r=timdream
(cherry picked from commit 2d482a0c069bded349670e61ec95574afb50124a)
Merge pull request #11408 from pivanov/bug-892086

Bug 892086 - [B2G][l10n][Spanish][Cost Control] Reset button on Settings has ellipses
(cherry picked from commit f1674bfb1340e2d384abf8e63e61c3e6c4e7d4a1)
Merge pull request #11612 from lodr/bug-869916-synchronizing-async-function-nextReset

Bug 869916 - Synchronizing the asynchronous function `nextReset()`
r=leo
(cherry picked from commit f35d33ac4304c1fc877768648667ebab1622b116)
Merge pull request #11609 from lodr/bug-902828-resizing-datalimit-buttons-in-fte

Bug 902828 - Changing size of data limit thresholds inside the FTE
r=arcturus
(cherry picked from commit c5f368518ae92caaa3ec822d53bcb45e1b0601c5)
Merge pull request #11629 from asutherland/email-blacklist-imap-caps

Bug 904022 - [email/IMAP] blacklist broken SPECIAL-USE implementations. r=lightsofapollo
(cherry picked from commit 8b54efdd03caf458b5a5503660389056c474aa4a)
Revert "Bug 903260 - [SMS][MMS] SettingsURL value is never used in sms/js/notification.js: Ringtones BROKEN"

This reverts commit 63c8779713feab8dd6172496f4d5d3fe785c9927.

Conflicts:
	apps/sms/test/unit/mock_audio.js
Bug 904470 - Use loadend event instead of paint event.
Merge pull request #11708 from alivedise/bugzilla/904470_v1-train/fix-class0-message

Bug 904470 - Use loadend event instead of paint event. r=timdream, a=leo+