Merge "Move camera config props to camera_config_prop"