CI stability fixes
See the commit messages. This doesn’t speed up the CI, but should mean fewer spurious test failures. (Not zero, though, I’ve just seen a couple of spurious flatpak failures. Edit: May have fixed them now.)
Edited by Philip Withnall