Merge changes I37292676,I324a0544

* changes:
  Move the notification logic out to a listener so there can be an Activity based version of the listener as well for NFC VCARD imports.
  Fix a BroadcastReceiver leak.