Merge "Add another purchase button that uses a key which isn't invalidated even if a new fingerprint is enrolled." into nyc-dev