Bug 941727 - Fix up test_unlock_to_camera