Merge proposals dependent on lp://qastaging/~thelinuxguy/openlp/flake-fixes

lp://qastaging/~thelinuxguy/openlp/flake-fixes has no merge proposals.