Merge changes I59089884,I0ec61e11 into sc-v2-dev

* changes:
  Update BiometricPrompt UI for large displays
  Revert "Update BiometricPrompt UI for large displays"