Merge proposals dependent on lp://qastaging/~tomasgroth/openlp/25bugfixes4

lp://qastaging/~tomasgroth/openlp/25bugfixes4 has no merge proposals.