Merge "Revert "Stop running face detection on bouncer if both face and fp are enrolled."" into tm-qpr-dev