Merge proposals dependent on lp://staging/~xnox/ubiquity/crypto-done

lp://staging/~xnox/ubiquity/crypto-done has no merge proposals.