Bug 937068 - Unxfail and enhance wait in test_contact_add_photo

The test is failing for me with issue in bug 934537 after I run the test more than once.

https://bugzilla.mozilla.org/show_bug.cgi?id=934537 - [Contacts] Trying to edit a contact generates a "Duplicate found" message