Merge pull request #1156 from zacc/unxfail_2tests

Unxfail test_gallery_edit_photo, test_contact_add_favorite
Unxfail SIM import tests