Revert switch_to_camera locator to more versatile locator
Fix bad camera frame locator