Bug 939062 - Improve wait in test_add_contact_to_favorites.py

I also added an extra step to test removing the contact as a favourite as well.