Comment 40 for bug 1794292

OK; upstream got to an idea similar to your patch. I'm away from my usual desk right now and apparently missing some credentials to log back in to gitlab, but I will update current PRs on gitlab to propose a fix similar to your patch: iterating through keyboards to remove them when freeing renderer/plugin.

Postponing SRUing what I uploaded to disco until we have patched blessed by upstream.

There are additional fixes to themes in the upstream git tree, I'll do a quick check at the same time if there are things we can safely cherry-pick.