Hello all,
So we have been spending some work in the past week, and I am happy to say that we can declare the merge of pine to m-c completed. There are a few missing bits, namely https://bugzilla.mozilla.org/show_bug.cgi?id=1288653, but we can live like this for now.
I have started a PR to merge kanikani on master also: https://bugzilla.mozilla.org/show_bug.cgi?id=1290161