Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev