Merge pull request #20180 from kamituel/Bug_1013845_chinese_words_garbled

Bug 1013845: Fix character encoding when sharing contacts via NFC r=mbudzynski
Merge pull request #20329 from gasolin/issue-1023238

Bug 1023238 - Remember my choice is not the default option pre-selected ..., r=alive
Bug 1020471 - WebrtcClient is not defined