Merge changes Ia4b541e0,I128b0cd6 into udc-qpr-dev

* changes:
  Resolve face detection related issues
  Repeated calls to cancel should cancel any previously scheduled cancellation timeout jobs