Merge "Run lock before fingerprint enroll" into tm-qpr-dev