Merge changes I708312ca,Ie51b4e36

* changes:
  2/n: Keep track of IBiometricsFace@1.0 challenge interruptions
  1/n: Slight changes to ClientMonitor's Callback