Merge changes Ibff5b56f,I24f48aef

* changes:
  Add null checks in BiometricService
  Update BiometricPrompt icons and logic