bug 905287 was caused by this commit.  Reverting "Merge pull request #11351 from jmcanterafonseca/fix_link_img"

This reverts commit dce27932836dfdf9645eae565bda084692ed1a1d.
bug 852361 -- Revert "Merge pull request #8726 from leob2g/Bug_852361_Device_is_shut_down_when_battery_level_become_two_percents"

This reverts commit 22e0768fbcec94d049b071bdbed967ed651cdd2e.
Merge pull request #10255 from lightsofapollo/bug-880485-use-removeChild-not-remove

Bug 872226 - Use removeChild (as was intended)
(cherry picked from commit cfcea9998ac4b50ac221d59eb1709371f1ed6767)
Bug 902390 - [sms][mms] the input is 1px too high with the 'Moz' font r=borja

(cherry picked from commit 54e79c453515a7b2ad443ccd99936ced1b3ff029)
Merge pull request #11343 from arcturus/bug-901472

Bug 901472 - [Cost Control] Modify the parameters for checking the credit in Colombia
r=salva
(cherry picked from commit b527d7406b4eed3bacdee78597bb4ff21bf9f7d0)
Merge pull request #11485 from etiennesegonzac/bug-904076-call-log-db-create

Bug 904076 - fixing a bug in the call log db creation path. r=rik
(cherry picked from commit 660775166253433e1ab7bf659b5881b135f81dbe)
Bug 897437 - SMS message timestamps do not display the expected strings. r=gnarf

Rewrote the message container handling function. Now with lots of unit tests
covering lots of edge cases.

This patch also does a very little bit of safe refactoring, still with unit
tests.

(cherry picked from commit e4e4b2fa63a61e97ce553dfd39c9316cf3fc4c75)
Merge pull request #11516 from leob2g/Bug_901801_897874_Followup_Notification_horizontally_scrollable_with_many_CB_messages

Bug 901801 - 897874 Followup: [Notification] horizontally scrollable with many CB messages, r=alive
(cherry picked from commit 1aa549b40d714e43846102a5a8b2c996f6493fdf)
Merge pull request #11548 from RudyLu/keyboard/Bug902352-placeholder_as_word_separator

Bug 902352 - Make Gaia keyboard treats the placeholder
r=timdream(cherry picked from commit be95c3b6757290fff4fdde7a2b73c68f599131a1)
Bug 905950 - [Messages] Recipient assimilation should only occur when composing a new message r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=905950

- Restrict recipient assimilation:
    - Only when in #new view
    - Only when there is a placeholder to inspect

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Merge pull request #11518 from crh0716/886002

Bug 886002 - Reset the stack bar everytime we are trying to refresh it r=evelyn(cherry picked from commit d65666d865b2b1ae686744be7e30c3d737db80a7)
Bug 903271 - Show statusbar when attention screen appears on fullscreen app
Merge pull request #11601 from rexboy7/fix-bug903271

Bug 903271 - Show statusbar when attention screen appears on fullscreen app
Merge pull request #11568 from mcirlanaru/bug_899236

Bug 899236 - [Lockscreen] Reintroduce camera button for... r=@alivedise(cherry picked from commit 86d7d11b4637977b4131845b311e4348fb42d131)

Conflicts:

	apps/system/js/lockscreen.js
Merge pull request #11620 from mcirlanaru/v1-train_bug_899236

Bug 899236  - [Lockscreen] Reintroduce passcode screen camera button [v1-train uplift]
Bug 905558 - Perform operations on active call at first, fallback to the previous call if the active call is null r=etinne a=leo+
Merge pull request #11038 from frsela/STK/Bug893614_b

Bug 893614: [STK]The maxlength of the inputbox didn't set corretly in GE.T_INPUT command. r=timdream
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)