Merge proposals dependent on lp:~phill-ridout/openlp/display_overide

lp:~phill-ridout/openlp/display_overide has no merge proposals.