Merge "Re-introduce camera_device type" into nyc-dev