Merge "Update button styles in fingerprint setup" into nyc-mr1-dev