Unxfail test_gallery_edit_photo, test_contact_add_favorite

These two are solid passes on `master` now

`master` -> Merge
`v1-train` -> Merge