I don't see this as a controversy. The Signal protocol is funded in the same way.
https://arstechnica.com/tech-policy/2016/04/whatsapp-is-now-...
https://arstechnica.com/tech-policy/2016/04/whatsapp-is-now-...
That's because governments aren't a monolith, the projects and interests of the NSF or the OTF do not necessarily overlap with those of the NSA or CIA.
Seems they've made their decision on that long ago.