Merge changes from topic "face_slice_update-qt-qpr1-dev" into qt-qpr1-dev

* changes:
  Clear face re-enroll setting when all faces removed
  Added secure setting for face re enrollment.