Merge "Fixes alignment for fingerprint animation during setup."