Merge changes I91d720d3,Ibfdc40d4 into sc-dev

* changes:
  Update Udfps fingerprint icon size
  Add UDFPS enrollment moving target