Merge "Re-do of FingerprintSensorProperties ui layer refactor" into udc-qpr-dev