Merge changes from topic "face-settings-challenge" into qt-r1-dev

* changes:
  Resolve challenge lifecycle race conditions
  Revert "Add generateChallenge() in onResume()"