Merge pull request #21906 from gasolin/issue-1022506

Bug 1022506 - Search results app uses a white icon, rather than a dedica..., r=kgrandon
Merge pull request #21891 from mcjimenez/bug1026381

Bug 1026381 - [SV] Do not modify the NFC setting if a valid SIM wasn't present at first run (r = jmcanterafonseca)
Merge pull request #21598 from 6a68/bug-1036030-fxa-l10n-html

Bug 1036030 - Introduce shared L10nHelper for inserting HTML into l10n p...