Merge pull request #20392 from fcampo/import-bt-err-tap-1022115

Bug 1022115 - [Contacts] Can't see detail of contact when multi import via Bluetooth (r=francisco)
Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
	apps/communications/contacts/test/unit/mock_activities.js