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

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