Merge changes I57f018e4,Ib1e92278 into sc-dev

* changes:
  Remove confirm button when falling back to fingerprint auth.
  Delay starting fingerprint sensor when using multi-sensor devices.