Xfail test_lockscreen_unlock_to_camera_with_pc
Revert switch_to_camera locator to more versatile locator
Merge pull request #1222 from zacc/camera_test_tweak

Camera test tweak