Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev