Merge "Bug fix - when enrolled, biometrics have ok safety state." into tm-dev