Merge "Overlapping text over fingerprint animation" into oc-dr1-dev