Merge changes Idb985b00,I41d3726d

* changes:
  Only show try again button for fingerprint
  Keep task stack listener around as long as dialog is showing