Merge proposals dependent on lp:~twom/canonical-identity-provider/2fa-qrcode-fix

lp:~twom/canonical-identity-provider/2fa-qrcode-fix has no merge proposals.