Merge change Iafa92b8f into eclair-mr2

* changes:
  remove accounts for authenticators that are uninstalled