Merge proposals dependent on lp://staging/~marcus-lundgren/footnote/fix-1021860

lp://staging/~marcus-lundgren/footnote/fix-1021860 has no merge proposals.