Merge "Refine fingerprint animation handling" into nyc-mr1-dev