Merge changes I2339e806,Ic7eaddc4 into sc-dev

* changes:
  Do not show fingerprint icon/circle underneath moving target
  Enlarge UDFPS enrollment progress bar