Bug 949958 - Include Pinyin IME in eng build by default
Bug 938321 - [email/backend] Implement utf-7 charset support using hand-rolled decoder.
Merge pull request #14667 from mcav/utf7

Bug 938321 - [email/backend] Implement utf-7 charset support using hand-rolled decoder. r=asuth
Revert "Merge pull request #14632 from alivedise/bugzilla/948596_v2/activity-window-size-copy"

This reverts commit 888f9df5515a47d2f5806efee77485e05e1e5416, reversing
changes made to 53b010647062b4e2637f98ac3538af1c7bfe723a.

This was backed out because of https://bugzilla.mozilla.org/show_bug.cgi?id=950136#c11
Merge pull request #14638 from timdream/include-pinyin

Bug 949958 - Include Pinyin IME in eng build by default, r=djf
Revert "Merge pull request #14667 from mcav/utf7"

This reverts commit cfa88581f0bdaa3d4b7a3773ae87edc55260a2ab, reversing
changes made to b44a75862ebcb651381eabc9c3a3b203d76d63bf.

This is breaking 6 integration tests
Revert "Revert "Merge pull request #14667 from mcav/utf7""

This reverts commit 7852023abb572c522a07af558e7c19f557cc4866.

That was a wrong revert, it didn't fix the failing tests.
Bug 947977 - [Messages] Bug 936370 regressed the scrolling behavior when redacting a multi-line message r=schung