Merge "Update button styles for fingerprint" into nyc-mr1-dev