Merge "Clear the previous biometric message only after the next face acquisition starts again." into main