Clayton Craft authored 2 years ago and alice committed 2 years ago

Drops some patches that were upstreamed, and includes a new patch from
Purism to fix some random crashes