Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev