Merge changes I912bf8bb,I8c50b8aa into main

* changes:
  Add small delay to animate device entry unlock icon
  Never use DeviceEntryInteractor unless behind the flexiglass flag