Merge changes I1da72a81,Ic0eafa52 into sc-dev

* changes:
  Fix IFingerprint VTS
  Keep a strong pointer to Session in the HAL