Merge proposals dependent on lp://staging/~raoul-snyman/openlp/fix-songusage-2.4

lp://staging/~raoul-snyman/openlp/fix-songusage-2.4 has no merge proposals.