Merge "Add ID argument to enable_test_camera shell cmd" into main