Remove setup/teardown from test_ftu_skip_tour.py as it causes problems on the Leo device
Merge pull request #1154 from bebef1987/crash_cam

xfail Bug 900012 - crash in mozilla::layers::GrallocBufferActor::ActorDestroy(mozilla::ipc::IProtocolManager<mozilla::ipc::RPCChannel::RPCListener>::ActorDestroyReason)
Xfail test_camera_multiple_shots bug #900012
Unxfail test_add_contact_to_favourites.py
Merge pull request #1155 from zacc/revise_test_ftu_setup

Remove setup/teardown from test_ftu_skip_tour.py as it causes problems o...
Unxfail test_gallery_edit_photo.py
Xfail 2 lockscreen_to_camera tests
Merge pull request #1156 from zacc/unxfail_2tests

Unxfail test_gallery_edit_photo, test_contact_add_favorite
Unxfail SIM import tests
Merge pull request #1158 from zacc/unxfail_sim_import

Unxfail SIM import tests
Bump marionette client to 0.5.36, see bug 899731
disable Keyboard FTU
xfail Bug 900905 - Changing mozSettings value of "keyboard.ftu.enabled" has no effect when launching the Keyboard app for the first time
Merge pull request #1161 from bebef1987/key_board

Keyboard FTU View
Put preventative wait into Contacts tests to wait for contacts lists to load especially after API insertions
Put preventative wait for app_update_notification for test_system_notification.py
Merge pull request #1162 from zacc/insert_contact_wait

Put preventative wait into Contacts tests to wait for contacts lists
xfail Bug 877611 - Make "Select time" popup, in Calendar app, more test friendly
Merge pull request #1164 from bebef1987/key_board

xfail Bug 900905 - Changing mozSettings value of "keyboard.ftu.enabled" has no effect when launching the Keyboard app for the first time
Bug 899984 - Everything.Me search results take a long time to show