Merge changes If61ac8f0,I3a20f400 into main

* changes:
  [flexiglass] Hydrates biometrics displayState with proper state
  [flexiglass] Report userPresent when device entered.