Merge proposals dependent on lp:~nikolai/picard/options-dialog-revamp

lp:~nikolai/picard/options-dialog-revamp has no merge proposals.