Merge proposals dependent on lp://qastaging/~bennett-6/openlp/android2

lp://qastaging/~bennett-6/openlp/android2 has no merge proposals.